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.git.patch1

diff --git a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch1 b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch1
index 2e9797e73975bb493816d71d7db64560a7891f2c..daa9953880fd0b326f34cd17c68f50f0dcdc5a93 100644 (file)
--- a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch1
+++ b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch1
@@ -1,6 +1,6 @@
-diff -ur a/libavformat/bluray.c b/libavformat/bluray.c
---- a/libavformat/bluray.c     2017-10-13 16:31:25.000000000 -0600
-+++ b/libavformat/bluray.c     2017-10-13 20:05:45.910046165 -0600
+diff -ru ffmpeg-3.0.orig/libavformat/bluray.c ffmpeg-3.0/libavformat/bluray.c
+--- ffmpeg-3.0.orig/libavformat/bluray.c       2015-03-13 11:34:50.000000000 -0600
++++ ffmpeg-3.0/libavformat/bluray.c    2016-05-09 14:07:34.758713307 -0600
 @@ -28,7 +28,7 @@
  #include "libavutil/opt.h"