From: Good Guy <good1.2guy@gmail.com>
Date: Wed, 23 Sep 2015 20:40:18 +0000 (-0600)
Subject: upgrade to ffmpeg-2.8
X-Git-Url: https://cinelerra-gg.org/git/?a=commitdiff_plain;h=5aad2133f228b736f033d6c48e1629078b858286;p=goodguy%2Fhistory.git

upgrade to ffmpeg-2.8
---

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
deleted file mode 100644
index 71211545..00000000
Binary files a/cinelerra-5.0/thirdparty/src/ffmpeg-2.7.2.tar.xz and /dev/null differ
diff --git a/cinelerra-5.0/thirdparty/src/ffmpeg-2.8.tar.xz b/cinelerra-5.0/thirdparty/src/ffmpeg-2.8.tar.xz
new file mode 100644
index 00000000..c25f5ab1
Binary files /dev/null and b/cinelerra-5.0/thirdparty/src/ffmpeg-2.8.tar.xz differ
diff --git a/cinelerra-5.0/thirdparty/src/ffmpeg.patch1 b/cinelerra-5.0/thirdparty/src/ffmpeg.patch1
index 8c351713..a1b1c1f3 100644
--- a/cinelerra-5.0/thirdparty/src/ffmpeg.patch1
+++ b/cinelerra-5.0/thirdparty/src/ffmpeg.patch1
@@ -1,9 +1,9 @@
---- a/configure	2015-04-27 13:07:19.545166083 -0600
-+++ b/configure	2015-04-27 13:10:23.468532800 -0600
-@@ -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."; }
+--- 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++ &&