git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ab922f9
)
avformat/avidec: fix handling dv in avi
author
Michael Niedermayer
<michaelni@gmx.at>
Fri, 21 Nov 2014 02:08:20 +0000
(
03:08
+0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 21 Nov 2014 02:34:13 +0000
(
03:34
+0100)
Fixes Ticket4086
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/avidec.c
patch
|
blob
|
history
diff --git
a/libavformat/avidec.c
b/libavformat/avidec.c
index
0cdcc08
..
78a6dea
100644
(file)
--- a/
libavformat/avidec.c
+++ b/
libavformat/avidec.c
@@
-1150,7
+1150,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)
@@
-1162,6
+1162,9
@@
start_sync:
goto start_sync;
}
+ if (avi->dv_demux && n != 0)
+ continue;
+
// parse ##dc/##wb
if (n < s->nb_streams) {
AVStream *st;