projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add Autosave continuous backups by Andras Reuss and Andrew-R
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
thirdparty
/
src
/
ffmpeg.git.patch3
diff --git
a/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch3
b/cinelerra-5.1/thirdparty/src/ffmpeg.git.patch3
index 34ce2a5aaf371ee21c40582ec43f3a7112cb3c96..fb8730e4bfedde00230ec0b2d28b85ae7316676d 100644
(file)
--- a/
cinelerra-5.1/thirdparty/src/ffmpeg.git.patch3
+++ b/
cinelerra-5.1/thirdparty/src/ffmpeg.git.patch3
@@
-1,8
+1,8
@@
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
-index
734ae54cac..26d9bbafbc
100644
+index
e91e7f1d33..0f9b26a6d3
100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
-@@ -48
5,6 +485
,9 @@ typedef struct AVProbeData {
+@@ -48
0,6 +480
,9 @@ typedef struct AVProbeData {
The user or muxer can override this through
AVFormatContext.avoid_negative_ts
*/
The user or muxer can override this through
AVFormatContext.avoid_negative_ts
*/
@@
-12,11
+12,10
@@
index 734ae54cac..26d9bbafbc 100644
#define AVFMT_SEEK_TO_PTS 0x4000000 /**< Seeking is based on PTS */
#define AVFMT_SEEK_TO_PTS 0x4000000 /**< Seeking is based on PTS */
-@@ -653,8 +656,8 @@ typedef struct AVInputFormat {
-
+@@ -650,7 +653,8 @@ typedef struct AVInputFormat {
/**
* Can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER, AVFMT_SHOW_IDS,
/**
* Can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER, AVFMT_SHOW_IDS,
-
-
* AVFMT_NOTIMESTAMPS, AVFMT_GENERIC_INDEX, AVFMT_TS_DISCONT, AVFMT_NOBINSEARCH,
+
* AVFMT_NOTIMESTAMPS, AVFMT_GENERIC_INDEX, AVFMT_TS_DISCONT, AVFMT_NOBINSEARCH,
- * AVFMT_NOGENSEARCH, AVFMT_NO_BYTE_SEEK, AVFMT_SEEK_TO_PTS.
+ * AVFMT_NOGENSEARCH, AVFMT_NO_BYTE_SEEK, AVFMT_SEEK_TO_PTS,
+ * AVFMT_SEEK_NOSTREAMS
- * AVFMT_NOGENSEARCH, AVFMT_NO_BYTE_SEEK, AVFMT_SEEK_TO_PTS.
+ * AVFMT_NOGENSEARCH, AVFMT_NO_BYTE_SEEK, AVFMT_SEEK_TO_PTS,
+ * AVFMT_SEEK_NOSTREAMS
@@
-24,10
+23,10
@@
index 734ae54cac..26d9bbafbc 100644
int flags;
diff --git a/libavformat/dv.c b/libavformat/dv.c
int flags;
diff --git a/libavformat/dv.c b/libavformat/dv.c
-index e
b44e0acb6..b23759dd86
100644
+index e
99422d4b5..58ce1bbb5f
100644
--- a/libavformat/dv.c
+++ b/libavformat/dv.c
--- a/libavformat/dv.c
+++ b/libavformat/dv.c
-@@ -6
32,6 +63
2,7 @@ static int dv_probe(const AVProbeData *p)
+@@ -6
42,6 +64
2,7 @@ static int dv_probe(const AVProbeData *p)
AVInputFormat ff_dv_demuxer = {
.name = "dv",
.long_name = NULL_IF_CONFIG_SMALL("DV (Digital Video)"),
AVInputFormat ff_dv_demuxer = {
.name = "dv",
.long_name = NULL_IF_CONFIG_SMALL("DV (Digital Video)"),
@@
-36,10
+35,10
@@
index eb44e0acb6..b23759dd86 100644
.read_probe = dv_probe,
.read_header = dv_read_header,
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
.read_probe = dv_probe,
.read_header = dv_read_header,
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
-index c
ba2b3d1f8..8427b2c421
100644
+index c
ff7f0cb54..8b6d22aff2
100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
-@@ -4
059,6 +4059
,7 @@ static const AVClass webm_dash_class = {
+@@ -4
251,6 +4251
,7 @@ static const AVClass webm_dash_class = {
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"),
@@
-47,7
+46,7
@@
index cba2b3d1f8..8427b2c421 100644
.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,
-@@ -4
072,6 +4073
,7 @@ AVInputFormat ff_matroska_demuxer = {
+@@ -4
264,6 +4265
,7 @@ AVInputFormat ff_matroska_demuxer = {
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"),
@@
-56,10
+55,10
@@
index cba2b3d1f8..8427b2c421 100644
.read_header = webm_dash_manifest_read_header,
.read_packet = webm_dash_manifest_read_packet,
diff --git a/libavformat/utils.c b/libavformat/utils.c
.read_header = webm_dash_manifest_read_header,
.read_packet = webm_dash_manifest_read_packet,
diff --git a/libavformat/utils.c b/libavformat/utils.c
-index
a63d71b0f4..fe6608ade2
100644
+index
807d9f10cb..55a444e7b6
100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
-@@ -24
72,6 +2472
,13 @@ static int seek_frame_internal(AVFormatContext *s, int stream_index,
+@@ -24
86,6 +2486
,13 @@ static int seek_frame_internal(AVFormatContext *s, int stream_index,
return seek_frame_byte(s, stream_index, timestamp, flags);
}
return seek_frame_byte(s, stream_index, timestamp, flags);
}