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 (file)
index 4c8196c..0000000
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 (file)
index 0000000..7121154
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 460b685651798da3d1cc29b8298ff78d63bc059c..8c351713b74c1ad848189cbf6d04a6699e00f20b 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 @@
+@@ -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" ||