projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update ffmpeg to 4.1, add sketcher plugin, crikey tweaks, titler colorpicker, keyfram...
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
thirdparty
/
src
/
ffmpeg-4.1.patch3
diff --git
a/cinelerra-5.1/thirdparty/src/ffmpeg-4.0.patch3
b/cinelerra-5.1/thirdparty/src/ffmpeg-4.1.patch3
similarity index 81%
rename from
cinelerra-5.1/thirdparty/src/ffmpeg-4.0.patch3
rename to
cinelerra-5.1/thirdparty/src/ffmpeg-4.1.patch3
index 3d64695a357199150f6ee790baa8da79d75e1f99..6e2ebbcd5a217f1d9da08fe8cfcb92ddf43f6e4c 100644
(file)
--- a/
cinelerra-5.1/thirdparty/src/ffmpeg-4.0.patch3
+++ b/
cinelerra-5.1/thirdparty/src/ffmpeg-4.1.patch3
@@
-1,6
+1,6
@@
diff -urN a/libavformat/avformat.h b/libavformat/avformat.h
diff -urN a/libavformat/avformat.h b/libavformat/avformat.h
---- a/libavformat/avformat.h 2018-
04-20 04:02:57.000000000 -06
00
-+++ b/libavformat/avformat.h 2018-
04-24 11:02:20.777232001 -06
00
+--- a/libavformat/avformat.h 2018-
11-05 16:22:26.000000000 -07
00
++++ b/libavformat/avformat.h 2018-
11-08 07:25:17.066799941 -07
00
@@ -487,6 +487,9 @@
The user or muxer can override this through
AVFormatContext.avoid_negative_ts
@@ -487,6 +487,9 @@
The user or muxer can override this through
AVFormatContext.avoid_negative_ts
@@
-22,8
+22,8
@@
diff -urN a/libavformat/avformat.h b/libavformat/avformat.h
int flags;
diff -urN a/libavformat/dv.c b/libavformat/dv.c
int flags;
diff -urN a/libavformat/dv.c b/libavformat/dv.c
---- a/libavformat/dv.c 2018-
04-13 17:34:28
.000000000 -0600
-+++ b/libavformat/dv.c 2018-
04-24 11:02:20.778232001 -06
00
+--- a/libavformat/dv.c 2018-
11-01 12:34:26
.000000000 -0600
++++ b/libavformat/dv.c 2018-
11-08 07:25:17.066799941 -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 -urN a/libavformat/dv.c b/libavformat/dv.c
.read_probe = dv_probe,
.read_header = dv_read_header,
diff -urN a/libavformat/matroskadec.c b/libavformat/matroskadec.c
.read_probe = dv_probe,
.read_header = dv_read_header,
diff -urN a/libavformat/matroskadec.c b/libavformat/matroskadec.c
---- a/libavformat/matroskadec.c 2018-
04-20 04:02:57.000000000 -06
00
-+++ b/libavformat/matroskadec.c 2018-
04-24 11:02:20.779232001 -06
00
-@@ -40
26,6 +4026
,7 @@
+--- a/libavformat/matroskadec.c 2018-
11-05 16:22:26.000000000 -07
00
++++ b/libavformat/matroskadec.c 2018-
11-08 07:25:17.067799930 -07
00
+@@ -40
30,6 +4030
,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 -urN 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,
-@@ -40
39,6 +4040
,7 @@
+@@ -40
43,6 +4044
,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"),
@@
-52,9
+52,9
@@
diff -urN a/libavformat/matroskadec.c b/libavformat/matroskadec.c
.read_header = webm_dash_manifest_read_header,
.read_packet = webm_dash_manifest_read_packet,
diff -urN a/libavformat/utils.c b/libavformat/utils.c
.read_header = webm_dash_manifest_read_header,
.read_packet = webm_dash_manifest_read_packet,
diff -urN a/libavformat/utils.c b/libavformat/utils.c
---- a/libavformat/utils.c 2018-
04-20 04:02:58.000000000 -06
00
-+++ b/libavformat/utils.c 2018-
04-24 11:02:20.780232001 -06
00
-@@ -247
1,6 +2471
,13 @@
+--- a/libavformat/utils.c 2018-
11-05 16:22:26.000000000 -07
00
++++ b/libavformat/utils.c 2018-
11-08 07:25:17.069799908 -07
00
+@@ -247
2,6 +2472
,13 @@
return seek_frame_byte(s, stream_index, timestamp, flags);
}
return seek_frame_byte(s, stream_index, timestamp, flags);
}