From: Good Guy Date: Fri, 21 Aug 2015 17:26:19 +0000 (-0600) Subject: so long, Michael Niedermayer... and thanks for all the fish!!! X-Git-Url: https://cinelerra-gg.org/git/?a=commitdiff_plain;h=ff25a5db2d01c183307afbfa4da645aab20ca479;p=goodguy%2Fhistory.git so long, Michael Niedermayer... and thanks for all the fish!!! --- diff --git a/cinelerra-5.0/thirdparty/src/ffmpeg-2.7.1.tar.xz b/cinelerra-5.0/thirdparty/src/ffmpeg-2.7.1.tar.xz deleted file mode 100644 index 4c8196c6..00000000 Binary files a/cinelerra-5.0/thirdparty/src/ffmpeg-2.7.1.tar.xz and /dev/null differ diff --git a/cinelerra-5.0/thirdparty/src/ffmpeg-2.7.2.tar.xz b/cinelerra-5.0/thirdparty/src/ffmpeg-2.7.2.tar.xz new file mode 100644 index 00000000..71211545 Binary files /dev/null and b/cinelerra-5.0/thirdparty/src/ffmpeg-2.7.2.tar.xz differ diff --git a/cinelerra-5.0/thirdparty/src/ffmpeg.patch1 b/cinelerra-5.0/thirdparty/src/ffmpeg.patch1 index 460b6856..8c351713 100644 --- a/cinelerra-5.0/thirdparty/src/ffmpeg.patch1 +++ b/cinelerra-5.0/thirdparty/src/ffmpeg.patch1 @@ -1,11 +1,11 @@ --- a/configure 2015-04-27 13:07:19.545166083 -0600 +++ b/configure 2015-04-27 13:10:23.468532800 -0600 -@@ -4979,7 +4979,9 @@ +@@ -5157,7 +5157,9 @@ warn "using libx264 without pkg-config"; } } && { check_cpp_condition x264.h "X264_BUILD >= 118" || die "ERROR: libx264 must be installed and version must be >= 0.118."; } --enabled libx265 && require_pkg_config x265 x265.h x265_encoder_encode && -+enabled libx265 && { use_pkg_config x265 "stdint.h x265.h" x265_encoder_encode || +-enabled libx265 && require_pkg_config x265 x265.h x265_api_get && ++enabled libx265 && { use_pkg_config x265 "stdint.h x265.h" x265_api_get || + { require libx265 x265.h x265_encoder_encode -lx265 -lstdc++ && + warn "using libx265 without pkg-config"; } } && { check_cpp_condition x265.h "X265_BUILD >= 57" ||