aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-05-07 03:20:13 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-06-02 22:59:50 +0200
commite1b2c93a23077ce60340241eca96f3fa10b89ec3 (patch)
treef601b645a69c38fc8b62cfd5542392187bd5b24a
parente529ff52a05f7533059ff17b30b5a1474d2719e5 (diff)
downloadffmpeg-e1b2c93a23077ce60340241eca96f3fa10b89ec3.tar.gz
avformat/h263dec/h263_probe: Check PSC bit 9 and 13 in
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 3ad21c50af042ab17bedf755ff8245392425c259) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/h263dec.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/h263dec.c b/libavformat/h263dec.c
index 486e4b0eb8..a581d4c4b5 100644
--- a/libavformat/h263dec.c
+++ b/libavformat/h263dec.c
@@ -41,6 +41,11 @@ static int h263_probe(AVProbeData *p)
&& src_fmt<6)
res_change++;
+ if (src_fmt != 7 && !(code&(1<<9)) && (code&(1<<5))) {
+ invalid_psc++;
+ continue;
+ }
+
if((code&0x30000)==0x20000 && src_fmt){
valid_psc++;
last_gn=0;