diff --git a/contrib/ffmpeg/CMakeLists.txt b/contrib/ffmpeg/CMakeLists.txt index 536d4c01e..2548b0f90 100644 --- a/contrib/ffmpeg/CMakeLists.txt +++ b/contrib/ffmpeg/CMakeLists.txt @@ -428,7 +428,7 @@ SET(FFMPEG_CONFIGURE_COMMAND EXTERNALPROJECT_ADD( ffmpeg DEPENDS ${FFMPEG_DEPENDENCIES} - URL http://ffmpeg.org/releases/ffmpeg-1.0.tar.gz + URL http://ffmpeg.org/releases/ffmpeg-1.1.2.tar.gz PATCH_COMMAND patch -p1 < ${CMAKE_SOURCE_DIR}/vendor/ffmpeg-banner.patch CONFIGURE_COMMAND ${FFMPEG_CONFIGURE_COMMAND} BUILD_IN_SOURCE 1 diff --git a/contrib/ffmpeg/README.md b/contrib/ffmpeg/README.md index 92c06b050..17394bf49 100644 --- a/contrib/ffmpeg/README.md +++ b/contrib/ffmpeg/README.md @@ -73,4 +73,4 @@ The helper and this documentation are based on [sffmpeg](https://github.com/pyke ## Version -PMS2 +PMS3 diff --git a/contrib/ffmpeg/vendor/ffmpeg-banner.patch b/contrib/ffmpeg/vendor/ffmpeg-banner.patch index 7c609d01c..c3c8a9f5b 100644 --- a/contrib/ffmpeg/vendor/ffmpeg-banner.patch +++ b/contrib/ffmpeg/vendor/ffmpeg-banner.patch @@ -14,7 +14,7 @@ } +#define FFMPEG_CONFIGURATION "http://git.io/ZHdseg" -+#define PMS_FFMPEG_VERSION 2 ++#define PMS_FFMPEG_VERSION 3 static void print_program_info(int flags, int level) { const char *indent = flags & INDENT? " " : "";