diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 734ae54cac..26d9bbafbc 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -485,6 +485,9 @@ typedef struct AVProbeData {
                                         The user or muxer can override this through
                                         AVFormatContext.avoid_negative_ts
                                         */
+#define AVFMT_SEEK_NOSTREAMS  0x80000 /**< Stream index ignored by seek,
+                                           or some streams fail to seek
+                                           */
 
 #define AVFMT_SEEK_TO_PTS   0x4000000 /**< Seeking is based on PTS */
 
@@ -653,8 +656,8 @@ typedef struct AVInputFormat {
 
     /**
      * Can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER, AVFMT_SHOW_IDS,
-     * 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
      */
     int flags;
 
diff --git a/libavformat/dv.c b/libavformat/dv.c
index eb44e0acb6..b23759dd86 100644
--- a/libavformat/dv.c
+++ b/libavformat/dv.c
@@ -632,6 +632,7 @@ static int dv_probe(const AVProbeData *p)
 AVInputFormat ff_dv_demuxer = {
     .name           = "dv",
     .long_name      = NULL_IF_CONFIG_SMALL("DV (Digital Video)"),
+    .flags          = AVFMT_SEEK_NOSTREAMS,
     .priv_data_size = sizeof(RawDVContext),
     .read_probe     = dv_probe,
     .read_header    = dv_read_header,
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index cba2b3d1f8..8427b2c421 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -4059,6 +4059,7 @@ static const AVClass webm_dash_class = {
 AVInputFormat ff_matroska_demuxer = {
     .name           = "matroska,webm",
     .long_name      = NULL_IF_CONFIG_SMALL("Matroska / WebM"),
+    .flags          = AVFMT_SEEK_NOSTREAMS,
     .extensions     = "mkv,mk3d,mka,mks",
     .priv_data_size = sizeof(MatroskaDemuxContext),
     .read_probe     = matroska_probe,
@@ -4072,6 +4073,7 @@ AVInputFormat ff_matroska_demuxer = {
 AVInputFormat ff_webm_dash_manifest_demuxer = {
     .name           = "webm_dash_manifest",
     .long_name      = NULL_IF_CONFIG_SMALL("WebM DASH Manifest"),
+    .flags          = AVFMT_SEEK_NOSTREAMS,
     .priv_data_size = sizeof(MatroskaDemuxContext),
     .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
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -2472,6 +2472,13 @@ static int seek_frame_internal(AVFormatContext *s, int stream_index,
         return seek_frame_byte(s, stream_index, timestamp, flags);
     }
 
+    if (stream_index != -1 && (s->iformat->flags & AVFMT_SEEK_NOSTREAMS)) {
+            timestamp = av_rescale_q(timestamp,
+                    s->streams[stream_index]->time_base,
+                    AV_TIME_BASE_Q);
+            stream_index = -1;
+    }
+
     if (stream_index < 0) {
         stream_index = av_find_default_stream_index(s);
         if (stream_index < 0)