aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dennison2009-10-06 15:30:08 +0000
committerKostya Shishkov2009-10-06 15:30:08 +0000
commit95ce961d886668bb713094bd0f71b40925cf680f (patch)
tree7ccf5b7f140f81ea9579c9b64d1866e7c58bacc8
parent01418506a2cf2ae5bee9931417279009b50bf531 (diff)
Since some junk may be or may be not present before actual VC-1 extradata,
search for real extradata start instead of always skipping one byte. Patch by Andrew Dennison gmailify(${name}d, lists) Thread: [PATCH] Fix VC1 "Incomplete extradata" for mkv files generated by eac3to Originally committed as revision 20178 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/vc1dec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index 73816018ff..421d8f77a6 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -3039,7 +3039,7 @@ static av_cold int vc1_decode_init(AVCodecContext *avctx)
}
buf2 = av_mallocz(avctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
- if(start[0]) start++; // in WVC1 extradata first byte is its size
+ start = find_next_marker(start, end); // in WVC1 extradata first byte is its size, but can be 0 in mkv
next = start;
for(; next < end; start = next){
next = find_next_marker(start + 4, end);