-diff -ur a/libavformat/avformat.h b/libavformat/avformat.h
---- a/libavformat/avformat.h 2017-10-13 16:31:25.000000000 -0600
-+++ b/libavformat/avformat.h 2017-10-13 20:07:24.178440418 -0600
-@@ -504,6 +504,9 @@
+diff -urN a/libavformat/avformat.h b/libavformat/avformat.h
+--- a/libavformat/avformat.h 2018-04-20 04:02:57.000000000 -0600
++++ b/libavformat/avformat.h 2018-04-24 11:02:20.777232001 -0600
+@@ -487,6 +487,9 @@
The user or muxer can override this through
AVFormatContext.avoid_negative_ts
*/
#define AVFMT_SEEK_TO_PTS 0x4000000 /**< Seeking is based on PTS */
-@@ -664,7 +667,8 @@
+@@ -647,7 +650,8 @@
/**
* Can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER, AVFMT_SHOW_IDS,
* AVFMT_GENERIC_INDEX, AVFMT_TS_DISCONT, AVFMT_NOBINSEARCH,
*/
int flags;
-diff -ur a/libavformat/dv.c b/libavformat/dv.c
---- a/libavformat/dv.c 2017-10-13 16:31:25.000000000 -0600
-+++ b/libavformat/dv.c 2017-10-13 20:07:24.178440418 -0600
+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 -0600
@@ -632,6 +632,7 @@
AVInputFormat ff_dv_demuxer = {
.name = "dv",
.priv_data_size = sizeof(RawDVContext),
.read_probe = dv_probe,
.read_header = dv_read_header,
-diff -ur a/libavformat/matroskadec.c b/libavformat/matroskadec.c
---- a/libavformat/matroskadec.c 2017-10-13 16:31:25.000000000 -0600
-+++ b/libavformat/matroskadec.c 2017-10-13 20:07:24.180440304 -0600
-@@ -3984,6 +3984,7 @@
+diff -urN a/libavformat/matroskadec.c b/libavformat/matroskadec.c
+--- a/libavformat/matroskadec.c 2018-04-20 04:02:57.000000000 -0600
++++ b/libavformat/matroskadec.c 2018-04-24 11:02:20.779232001 -0600
+@@ -4026,6 +4026,7 @@
AVInputFormat ff_matroska_demuxer = {
.name = "matroska,webm",
.long_name = NULL_IF_CONFIG_SMALL("Matroska / WebM"),
.extensions = "mkv,mk3d,mka,mks",
.priv_data_size = sizeof(MatroskaDemuxContext),
.read_probe = matroska_probe,
-@@ -3997,6 +3998,7 @@
+@@ -4039,6 +4040,7 @@
AVInputFormat ff_webm_dash_manifest_demuxer = {
.name = "webm_dash_manifest",
.long_name = NULL_IF_CONFIG_SMALL("WebM DASH Manifest"),
.priv_data_size = sizeof(MatroskaDemuxContext),
.read_header = webm_dash_manifest_read_header,
.read_packet = webm_dash_manifest_read_packet,
-Only in b/libavformat: matroskadec.c.orig
-diff -ur a/libavformat/utils.c b/libavformat/utils.c
---- a/libavformat/utils.c 2017-10-13 16:31:25.000000000 -0600
-+++ b/libavformat/utils.c 2017-10-13 20:07:24.182440190 -0600
-@@ -2415,6 +2415,13 @@
+diff -urN a/libavformat/utils.c b/libavformat/utils.c
+--- a/libavformat/utils.c 2018-04-20 04:02:58.000000000 -0600
++++ b/libavformat/utils.c 2018-04-24 11:02:20.780232001 -0600
+@@ -2471,6 +2471,13 @@
return seek_frame_byte(s, stream_index, timestamp, flags);
}
if (stream_index < 0) {
stream_index = av_find_default_stream_index(s);
if (stream_index < 0)
-Only in b/libavformat: utils.c.orig