aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/h261dec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-09 01:12:10 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-09 01:12:10 +0100
commit557571ff7db57a5d21aa02af924a7f8e1fd64854 (patch)
treec981bf7ac973c51183512022cade3389b63a7c4f /libavformat/h261dec.c
parent891f33cc705240907b58c88d0b119c4fad479d90 (diff)
downloadandroid_external_ffmpeg-557571ff7db57a5d21aa02af924a7f8e1fd64854.tar.gz
android_external_ffmpeg-557571ff7db57a5d21aa02af924a7f8e1fd64854.tar.bz2
android_external_ffmpeg-557571ff7db57a5d21aa02af924a7f8e1fd64854.zip
avformat/h261dec: dont accept invalid gobs in probe as valid
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/h261dec.c')
-rw-r--r--libavformat/h261dec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/h261dec.c b/libavformat/h261dec.c
index 0bfc824226..a1d682128d 100644
--- a/libavformat/h261dec.c
+++ b/libavformat/h261dec.c
@@ -43,10 +43,10 @@ static int h261_probe(AVProbeData *p)
else valid_psc++;
if(src_fmt){ // CIF
- static const int lut[16]={1,2,3,4,5,6,7,8,9,10,11,12,0,1,2,3};
+ static const int lut[16]={1,2,3,4,5,6,7,8,9,10,11,12,0,16,16,16};
next_gn = lut[gn];
}else{ //QCIF
- static const int lut[16]={1,3,4,5,6,0,1,2,3,4,5,6,0,1,2,3,4};
+ static const int lut[16]={1,3,16,5,16,0,16,16,16,16,16,16,16,16,16,16};
next_gn = lut[gn];
}
}