diff options
| author | autoantwort <41973254+autoantwort@users.noreply.github.com> | 2021-05-21 10:20:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-21 01:20:29 -0700 |
| commit | 19b171468d2ddfdd934e7b7952c75555a0243eee (patch) | |
| tree | ae494685b5f545995bd226e65c60e85d17ca9710 | |
| parent | 63e8ef6f20f93f342792389fdec7548361a42f6d (diff) | |
| download | vcpkg-19b171468d2ddfdd934e7b7952c75555a0243eee.tar.gz vcpkg-19b171468d2ddfdd934e7b7952c75555a0243eee.zip | |
[ffmpeg] add usage (#17284)
* [ffmpeg] add usage
* [ffmpeg] increase version
* add version files
* add version files
* Trigger Build
* add version files
* Trigger Build
* Trigger Build
* Bump port-version.
* Trigger Build
* add version files
* Trigger Build
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Co-authored-by: Billy Robert ONeal III <bion@microsoft.com>
| -rw-r--r-- | ports/ffmpeg/usage | 6 | ||||
| -rw-r--r-- | ports/ffmpeg/vcpkg.json | 1 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/f-/ffmpeg.json | 5 |
4 files changed, 13 insertions, 1 deletions
diff --git a/ports/ffmpeg/usage b/ports/ffmpeg/usage new file mode 100644 index 000000000..6ef6c3bd0 --- /dev/null +++ b/ports/ffmpeg/usage @@ -0,0 +1,6 @@ +To use ffmpeg add the following to your CMake project: + + find_package(FFMPEG REQUIRED) + target_include_directories(main PRIVATE ${FFMPEG_INCLUDE_DIRS}) + target_link_directories(main PRIVATE ${FFMPEG_LIBRARY_DIRS}) + target_link_libraries(main PRIVATE ${FFMPEG_LIBRARIES}) diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json index 870347efb..3ac2bfccb 100644 --- a/ports/ffmpeg/vcpkg.json +++ b/ports/ffmpeg/vcpkg.json @@ -1,6 +1,7 @@ { "name": "ffmpeg", "version-string": "4.4", + "port-version": 1, "description": [ "a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.", "FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations." diff --git a/versions/baseline.json b/versions/baseline.json index 8b17b2f20..0db7c410d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1966,7 +1966,7 @@ }, "ffmpeg": { "baseline": "4.4", - "port-version": 0 + "port-version": 1 }, "ffnvcodec": { "baseline": "10.0.26.0", diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json index 86de96856..4b613ade2 100644 --- a/versions/f-/ffmpeg.json +++ b/versions/f-/ffmpeg.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "5ae25637fccfc24bbaf8ab7fbf735191952595fd", + "version-string": "4.4", + "port-version": 1 + }, + { "git-tree": "648aee5015e8d511d44854e1056e4288683935cc", "version-string": "4.4", "port-version": 0 |