ffmpeg 3.4.1, add libopus, openexr probe tweak, rel path for filelist, avg_frame_rate...

[goodguy/history.git] / cinelerra-5.1 / thirdparty / src / ffmpeg-3.3.4.patch1

diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg-3.3.4.patch1 b/cinelerra-5.1/thirdparty/src/ffmpeg-3.3.4.patch1
deleted file mode 100644 (file)
index 40d7edd..0000000
--- a/cinelerra-5.1/thirdparty/src/ffmpeg-3.3.4.patch1
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -urN a/configure b/configure
---- a/configure        2017-04-12 19:55:54.000000000 -0600
-+++ b/configure        2017-04-16 16:12:23.518837543 -0600
-@@ -5812,7 +5812,7 @@
-                                { check_lib openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-                                die "ERROR: libopenjpeg not found"; }
- enabled libopenmpt        && require_pkg_config "libopenmpt >= 0.2.6557" libopenmpt/libopenmpt.h openmpt_module_create
--enabled libopus           && require_pkg_config opus opus_multistream.h opus_multistream_decoder_create
-+enabled libopus           && use_pkg_config opus opus_multistream.h opus_multistream_decoder_create
- enabled libpulse          && require_pkg_config libpulse pulse/pulseaudio.h pa_context_new
- enabled librtmp           && require_pkg_config librtmp librtmp/rtmp.h RTMP_Socket
- enabled librubberband     && require_pkg_config "rubberband >= 1.8.1" rubberband/rubberband-c.h rubberband_new
-@@ -5871,7 +5871,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++ &&
-+                                 warn "using libx265 without pkg-config"; } } &&
-                              { check_cpp_condition x265.h "X265_BUILD >= 68" ||
-                                die "ERROR: libx265 version must be >= 68."; }
- enabled libxavs           && require libxavs "stdint.h xavs.h" xavs_encoder_encode -lxavs