projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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.4.1.patch3
diff --git
a/cinelerra-5.1/thirdparty/src/ffmpeg-3.3.4.patch5
b/cinelerra-5.1/thirdparty/src/ffmpeg-3.4.1.patch3
similarity index 79%
rename from
cinelerra-5.1/thirdparty/src/ffmpeg-3.3.4.patch5
rename to
cinelerra-5.1/thirdparty/src/ffmpeg-3.4.1.patch3
index 55cc48b8984b8f1d29e07effe274ee1ac6aa8c5a..a96cf1cd88fd92cff3222797586c201e3d29285c 100644
(file)
--- a/
cinelerra-5.1/thirdparty/src/ffmpeg-3.3.4.patch5
+++ b/
cinelerra-5.1/thirdparty/src/ffmpeg-3.4.1.patch3
@@
-1,6
+1,6
@@
diff -ur a/libavformat/avformat.h b/libavformat/avformat.h
diff -ur a/libavformat/avformat.h b/libavformat/avformat.h
---- a/libavformat/avformat.h 2017-
06-06 20:03:55.000000000 -06
00
-+++ b/libavformat/avformat.h 2017-
07-20 09:10:40.434571231 -06
00
+--- a/libavformat/avformat.h 2017-
12-10 14:35:10.000000000 -07
00
++++ b/libavformat/avformat.h 2017-
12-18 11:11:31.791996302 -07
00
@@ -504,6 +504,9 @@
The user or muxer can override this through
AVFormatContext.avoid_negative_ts
@@ -504,6 +504,9 @@
The user or muxer can override this through
AVFormatContext.avoid_negative_ts
@@
-22,8
+22,8
@@
diff -ur a/libavformat/avformat.h b/libavformat/avformat.h
int flags;
diff -ur a/libavformat/dv.c b/libavformat/dv.c
int flags;
diff -ur a/libavformat/dv.c b/libavformat/dv.c
---- a/libavformat/dv.c 2017-
06-06 20:03:55.000000000 -06
00
-+++ b/libavformat/dv.c 2017-
07-20 09:12:00.277148325 -06
00
+--- a/libavformat/dv.c 2017-
12-10 14:35:10.000000000 -07
00
++++ b/libavformat/dv.c 2017-
12-18 11:11:31.792996246 -07
00
@@ -632,6 +632,7 @@
AVInputFormat ff_dv_demuxer = {
.name = "dv",
@@ -632,6 +632,7 @@
AVInputFormat ff_dv_demuxer = {
.name = "dv",
@@
-33,9
+33,9
@@
diff -ur a/libavformat/dv.c b/libavformat/dv.c
.read_probe = dv_probe,
.read_header = dv_read_header,
diff -ur a/libavformat/matroskadec.c b/libavformat/matroskadec.c
.read_probe = dv_probe,
.read_header = dv_read_header,
diff -ur a/libavformat/matroskadec.c b/libavformat/matroskadec.c
---- a/libavformat/matroskadec.c 2017-
06-06 20:03:55.000000000 -06
00
-+++ b/libavformat/matroskadec.c 2017-
07-20 12:29:39.804273095 -06
00
-@@ -39
36,6 +3936
,7 @@
+--- a/libavformat/matroskadec.c 2017-
12-10 14:35:10.000000000 -07
00
++++ b/libavformat/matroskadec.c 2017-
12-18 11:11:31.793996189 -07
00
+@@ -39
84,6 +3984
,7 @@
AVInputFormat ff_matroska_demuxer = {
.name = "matroska,webm",
.long_name = NULL_IF_CONFIG_SMALL("Matroska / WebM"),
AVInputFormat ff_matroska_demuxer = {
.name = "matroska,webm",
.long_name = NULL_IF_CONFIG_SMALL("Matroska / WebM"),
@@
-43,7
+43,7
@@
diff -ur a/libavformat/matroskadec.c b/libavformat/matroskadec.c
.extensions = "mkv,mk3d,mka,mks",
.priv_data_size = sizeof(MatroskaDemuxContext),
.read_probe = matroska_probe,
.extensions = "mkv,mk3d,mka,mks",
.priv_data_size = sizeof(MatroskaDemuxContext),
.read_probe = matroska_probe,
-@@ -39
49,6 +3950
,7 @@
+@@ -39
97,6 +3998
,7 @@
AVInputFormat ff_webm_dash_manifest_demuxer = {
.name = "webm_dash_manifest",
.long_name = NULL_IF_CONFIG_SMALL("WebM DASH Manifest"),
AVInputFormat ff_webm_dash_manifest_demuxer = {
.name = "webm_dash_manifest",
.long_name = NULL_IF_CONFIG_SMALL("WebM DASH Manifest"),
@@
-51,10
+51,10
@@
diff -ur a/libavformat/matroskadec.c b/libavformat/matroskadec.c
.priv_data_size = sizeof(MatroskaDemuxContext),
.read_header = webm_dash_manifest_read_header,
.read_packet = webm_dash_manifest_read_packet,
.priv_data_size = sizeof(MatroskaDemuxContext),
.read_header = webm_dash_manifest_read_header,
.read_packet = webm_dash_manifest_read_packet,
-diff -ur a/libavformat/utils.c
b
/libavformat/utils.c
---- a/libavformat/utils.c 2017-
06-06 20:04:02.000000000 -06
00
-+++ b/libavformat/utils.c 2017-
07-20 09:53:28.684729516 -06
00
-@@ -241
2,6 +2412
,13 @@
+diff -ur a/libavformat/utils.c
.
/libavformat/utils.c
+--- a/libavformat/utils.c 2017-
12-10 14:35:18.000000000 -07
00
++++ b/libavformat/utils.c 2017-
12-18 11:11:31.795996077 -07
00
+@@ -241
6,6 +2416
,13 @@
return seek_frame_byte(s, stream_index, timestamp, flags);
}
return seek_frame_byte(s, stream_index, timestamp, flags);
}