summaryrefslogtreecommitdiffstats
path: root/contrib/ffmpeg/A13-avi-dv.patch
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/ffmpeg/A13-avi-dv.patch')
-rw-r--r--contrib/ffmpeg/A13-avi-dv.patch37
1 files changed, 0 insertions, 37 deletions
diff --git a/contrib/ffmpeg/A13-avi-dv.patch b/contrib/ffmpeg/A13-avi-dv.patch
deleted file mode 100644
index 1424fcc48..000000000
--- a/contrib/ffmpeg/A13-avi-dv.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-commit 0fc61c6ab6912a2f0c40fdd3f3c591bc2a33efd4
-Author: Michael Niedermayer <[email protected]>
-Date: Sat Nov 28 21:06:45 2015 +0100
-
- avi: Validate the stream-id for DV as well
-
- Avoid false positives while syncing.
-
- Bug-Id: ffmpeg/4086
- Bug-Id: 879
-
- Signed-off-by: Michael Niedermayer <[email protected]>
- Signed-off-by: Luca Barbato <[email protected]>
-
-diff --git a/libavformat/avidec.c b/libavformat/avidec.c
-index 43c178f..477e045 100644
---- a/libavformat/avidec.c
-+++ b/libavformat/avidec.c
-@@ -995,7 +995,7 @@ start_sync:
- goto start_sync;
- }
-
-- n = avi->dv_demux ? 0 : get_stream_idx(d);
-+ n = get_stream_idx(d);
-
- if (!((i - avi->last_pkt_pos) & 1) &&
- get_stream_idx(d + 1) < s->nb_streams)
-@@ -1007,6 +1007,9 @@ start_sync:
- goto start_sync;
- }
-
-+ if (avi->dv_demux && n != 0)
-+ continue;
-+
- // parse ##dc/##wb
- if (n < s->nb_streams) {
- AVStream *st;