upgrade x264 via Andrew

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index 8e2d0fc82595a9981b278a92b044415123f71c5b..9d483b52146bbb8249f33363ebbcfcad38f61923 100644 (file)
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -364,7 +364,7 @@ PKG_3RD([twolame],[auto],
   [  libtwolame ])
 
 PKG_3RD([x264],[auto],
-  [x264-snapshot-20191217-2245-stable],
+  [x264-snapshot-20210615-master],
   [ libx264.a ],
   [ . ])
 

diff --git a/cinelerra-5.1/msg/txt b/cinelerra-5.1/msg/txt
index f46d10c0ba9fa3771d95b4e91ce2e0434eeda5f9..cc15015cb3776d192d0de32d756bac8f4a71ada4 100644 (file)
--- a/cinelerra-5.1/msg/txt
+++ b/cinelerra-5.1/msg/txt
@@ -7,6 +7,7 @@ For usage help, refer to the following:
   High fps rendering formats added for over 60 fps.
   Upgrade of libjpeg-turbo to 2.1.0.
   Additional mxf + other rendering formats added.
+.
 2021 May New Features of note:
   Context Help has been added using hotkey Alt/h by Georgy.  The
    help page will come up in your web browser tab for the item 
@@ -15,7 +16,7 @@ For usage help, refer to the following:
    /https://cinelerra-gg.org/download/CinelerraGG_Manual/Troubleshooting_Help.html
 .
 2021 March New Features of note:
-  AppImage is the method of dibrusging new releases;
+  AppImage is the method of distributing new releases;
    Newer distros use: CinGG-20210331-x86_64.AppImage 
    Older distros use: CinGG-20210331-x86_64-older_distros.AppImage
   There are 2 new plugins: Posterize and Timelapse Helper.

diff --git a/cinelerra-5.1/thirdparty/downloads.txt b/cinelerra-5.1/thirdparty/downloads.txt
index 368fc70b91241d3df8281d3adce867468da64568..dbbff7326221389f7542bee798073204bfaed46b 100644 (file)
--- a/cinelerra-5.1/thirdparty/downloads.txt
+++ b/cinelerra-5.1/thirdparty/downloads.txt
@@ -30,7 +30,8 @@ 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.1.0.tar.gz
 https://sourceforge.net/projects/libuuid/files/latest/download?source=directory - 1.0.3
-ftp://ftp.videolan.org/pub/x264/snapshots/x264-snapshot-20191217-2245-stable.tar.bz2
+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://bitbucket.org/multicoreware/x265/downloads/x265_3.4.tar.gz
 https://ffmpeg.org/releases/ffmpeg-4.3.tar.bz2
 https://github.com/webmproject/libvpx/archive/v1.8.2.tar.gz

diff --git a/cinelerra-5.1/thirdparty/src/x264-snapshot-20210615-master.patch1 b/cinelerra-5.1/thirdparty/src/x264-snapshot-20210615-master.patch1
new file mode 100644 (file)
index 0000000..9cd14f2
--- /dev/null
+++ b/cinelerra-5.1/thirdparty/src/x264-snapshot-20210615-master.patch1
@@ -0,0 +1,19 @@
+diff -ur a/encoder/encoder.c b/encoder/encoder.c
+--- a/encoder/encoder.c        2016-02-20 14:45:07.000000000 -0700
++++ b/encoder/encoder.c        2016-12-29 07:08:32.247434972 -0700
+@@ -614,6 +614,7 @@
+         return -1;
+     }
+ 
++#if 0
+     /* Detect default ffmpeg settings and terminate with an error. */
+     if( b_open )
+     {
+@@ -637,6 +638,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/x264-snapshot-20210615-master.tar.xz b/cinelerra-5.1/thirdparty/src/x264-snapshot-20210615-master.tar.xz
new file mode 100644 (file)
index 0000000..5dc6053
Binary files /dev/null and b/cinelerra-5.1/thirdparty/src/x264-snapshot-20210615-master.tar.xz differ