upgrade x264 to r3106 stable release

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index 39a2d0c5ad0758c47d69e5891ea2bd84fdca5928..f9d2ab8ab7f73980ea12c9e52a251f71ffd929ec 100644 (file)
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -417,7 +417,7 @@ PKG_3RD([twolame],[auto],
   [  libtwolame ])
 
 PKG_3RD([x264],[auto],
-  [x264-snapshot-20210615-master],
+  [x264-stable],
   [ libx264.a ],
   [ . ])
 

diff --git a/cinelerra-5.1/thirdparty/downloads.txt b/cinelerra-5.1/thirdparty/downloads.txt
index c7ebc835ff538f66093e4ac7da18d2fb1d29a7e4..272f43a8768384f734c9e786fb490fff9ce58cd2 100644 (file)
--- a/cinelerra-5.1/thirdparty/downloads.txt
+++ b/cinelerra-5.1/thirdparty/downloads.txt
@@ -32,8 +32,7 @@ http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.bz2
 https://sourceforge.net/projects/lame/files/latest/download?source=directory = 3.100
 https://download.osgeo.org/libtiff/tiff-4.5.0.tar.xz
 https://sourceforge.net/projects/libuuid/files/latest/download?source=directory - 1.0.3
-https://code.videolan.org/videolan/x264/-/tree/stable/x264-stable.tar.gz
-https://code.videolan.org/videolan/x264/-/tree/master/x264-snapshot-20210615-master.tar.xz (Andrew does somehow)
+https://code.videolan.org/videolan/x264/-/tree/stable/x264-stable.tar.gz (Jan. 2023 version r3106)
 https://bitbucket.org/multicoreware/x265_git/downloads/x265_3.5.tar.gz
 https://ffmpeg.org/releases/ffmpeg-5.1.tar.bz2
 https://github.com/webmproject/libvpx/archive/v1.13.0.tar.gz

diff --git a/cinelerra-5.1/thirdparty/src/264-stable.patch1 b/cinelerra-5.1/thirdparty/src/264-stable.patch1
new file mode 100644 (file)
index 0000000..08026a9
--- /dev/null
+++ b/cinelerra-5.1/thirdparty/src/264-stable.patch1
@@ -0,0 +1,18 @@
+--- a/encoder/encoder.c        2023-04-01 19:08:58.420132123 -0600
++++ b/encoder/encoder.c        2023-04-01 18:52:48.148808059 -0600
+@@ -667,6 +667,7 @@
+         return -1;
+     }
+ 
++#if 0
+     /* Detect default ffmpeg settings and terminate with an error. */
+     if( b_open )
+     {
+@@ -690,6 +691,7 @@
+             return -1;
+         }
+     }
++#endif
+ 
+     if( h->param.rc.i_rc_method < 0 || h->param.rc.i_rc_method > 2 )
+     {

diff --git a/cinelerra-5.1/thirdparty/src/264-stable.tar.gz b/cinelerra-5.1/thirdparty/src/264-stable.tar.gz
new file mode 100644 (file)
index 0000000..45b8f4c
Binary files /dev/null and b/cinelerra-5.1/thirdparty/src/264-stable.tar.gz differ