From: Good Guy <good1.2guy@gmail.com>
Date: Tue, 4 Oct 2016 22:57:51 +0000 (-0600)
Subject: upgrade ffmpeg, x265
X-Git-Url: https://git.cinelerra-gg.org/git/?a=commitdiff_plain;h=7febad89b726934306bf6ab994f54da5e09f1f64;p=goodguy%2Fhistory.git

upgrade ffmpeg, x265
---

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index 9f92fca3..bdd1abb7 100644
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -135,7 +135,7 @@ PKG_3RD([fdk],[auto],
   [ libAACdec/include libAACenc/include libSYS/include ])
 
 PKG_3RD([ffmpeg],[yes],
-  [ffmpeg-3.1.2],
+  [ffmpeg-3.1.4],
   [ libavutil/libavutil.a \
     libavcodec/libavcodec.a \
     libpostproc/libpostproc.a \
@@ -309,7 +309,7 @@ PKG_3RD([x264],[yes],
   [ . ])
 
 PKG_3RD([x265],[yes],
-  [x265_2.0],
+  [x265_2.1],
   [ libx265.a ],
   [ . source ])
 
diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg-3.1.2.tar.xz b/cinelerra-5.1/thirdparty/src/ffmpeg-3.1.4.tar.xz
similarity index 50%
rename from cinelerra-5.1/thirdparty/src/ffmpeg-3.1.2.tar.xz
rename to cinelerra-5.1/thirdparty/src/ffmpeg-3.1.4.tar.xz
index 31c5b34c..8008b3a1 100644
Binary files a/cinelerra-5.1/thirdparty/src/ffmpeg-3.1.2.tar.xz and b/cinelerra-5.1/thirdparty/src/ffmpeg-3.1.4.tar.xz differ
diff --git a/cinelerra-5.1/thirdparty/src/x265_2.0.tar.xz b/cinelerra-5.1/thirdparty/src/x265_2.0.tar.xz
deleted file mode 100644
index c541d5b7..00000000
Binary files a/cinelerra-5.1/thirdparty/src/x265_2.0.tar.xz and /dev/null differ
diff --git a/cinelerra-5.1/thirdparty/src/x265_2.1.tar.xz b/cinelerra-5.1/thirdparty/src/x265_2.1.tar.xz
new file mode 100644
index 00000000..900b9412
Binary files /dev/null and b/cinelerra-5.1/thirdparty/src/x265_2.1.tar.xz differ