From 7bbc686f82146dfdc5201dc43c9d90b466d0f065 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Sun, 22 Feb 2009 20:48:12 +0000
Subject: [PATCH] Fix vc1 split(). Fixes Subtitle-sample.evo, issue52.
Originally committed as revision 17533 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/vc1_parser.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/libavcodec/vc1_parser.c b/libavcodec/vc1_parser.c
index a9baccce79a..3f4618dbedc 100644
--- a/libavcodec/vc1_parser.c
+++ b/libavcodec/vc1_parser.c
@@ -99,11 +99,17 @@ static int vc1_split(AVCodecContext *avctx,
{
int i;
uint32_t state= -1;
+ int charged=0;
for(i=0; i<buf_size; i++){
state= (state<<8) | buf[i];
- if(IS_MARKER(state) && state != VC1_CODE_SEQHDR && state != VC1_CODE_ENTRYPOINT)
- return i-3;
+ if(IS_MARKER(state)){
+ if(state == VC1_CODE_SEQHDR || state == VC1_CODE_ENTRYPOINT){
+ charged=1;
+ }else if(charged){
+ return i-3;
+ }
+ }
}
return 0;
}
--
GitLab