upgrade to ffmpeg-2.8

[goodguy/history.git] / cinelerra-5.0 / thirdparty / src / ffmpeg.patch1

diff --git a/cinelerra-5.0/thirdparty/src/ffmpeg.patch1 b/cinelerra-5.0/thirdparty/src/ffmpeg.patch1
index 460b685651798da3d1cc29b8298ff78d63bc059c..a1b1c1f372e9d71cdb19ba42636b6146929933f6 100644 (file)
--- 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 @@
-                                  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 ||
+--- a/configure        2015-09-10 13:36:03.763986195 -0600
++++ b/configure        2015-09-10 13:37:25.190550438 -0600
+@@ -5315,7 +5315,9 @@
+                                die "ERROR: libx264 must be installed and version must be >= 0.118."; } &&
+                              { check_cpp_condition x264.h "X264_MPEG2" &&
+                                enable libx262; }
+-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" ||