From d06c22b167a79c320617ff90d322e376374d4291 Mon Sep 17 00:00:00 2001 From: Bradley Sepos Date: Thu, 11 Feb 2016 13:48:13 -0500 Subject: contrib: Rename libav patch for better DV in AVI compatibility. (cherry picked from commit ffd8cb1ca51961ecf378697d63f004fe1f870dbb) --- contrib/ffmpeg/A12-avi-dv.diff | 37 ------------------------------------- contrib/ffmpeg/A12-avi-dv.patch | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 37 deletions(-) delete mode 100644 contrib/ffmpeg/A12-avi-dv.diff create mode 100644 contrib/ffmpeg/A12-avi-dv.patch (limited to 'contrib/ffmpeg') diff --git a/contrib/ffmpeg/A12-avi-dv.diff b/contrib/ffmpeg/A12-avi-dv.diff deleted file mode 100644 index 1424fcc48..000000000 --- a/contrib/ffmpeg/A12-avi-dv.diff +++ /dev/null @@ -1,37 +0,0 @@ -commit 0fc61c6ab6912a2f0c40fdd3f3c591bc2a33efd4 -Author: Michael Niedermayer -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 - Signed-off-by: Luca Barbato - -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; diff --git a/contrib/ffmpeg/A12-avi-dv.patch b/contrib/ffmpeg/A12-avi-dv.patch new file mode 100644 index 000000000..1424fcc48 --- /dev/null +++ b/contrib/ffmpeg/A12-avi-dv.patch @@ -0,0 +1,37 @@ +commit 0fc61c6ab6912a2f0c40fdd3f3c591bc2a33efd4 +Author: Michael Niedermayer +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 + Signed-off-by: Luca Barbato + +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; -- cgit v1.2.3