diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-07 18:39:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-07 20:39:08 +0100 |
| commit | 3836af476534e6f84be7b3a19afce3530af50703 (patch) | |
| tree | 9b8d67cca391d764c7ef8b6da85b0d899f4efc42 /libavformat | |
| parent | 3bcd5c1e31e2f222a65e727a9681b23b89506f38 (diff) | |
| download | ffmpeg-3836af476534e6f84be7b3a19afce3530af50703.tar.gz | |
avformat/mpegvideodec: check seq headers more completely during probing
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/mpegvideodec.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/libavformat/mpegvideodec.c b/libavformat/mpegvideodec.c index a400978d02..ade76d860e 100644 --- a/libavformat/mpegvideodec.c +++ b/libavformat/mpegvideodec.c @@ -23,6 +23,8 @@ #include "avformat.h" #include "rawdec.h" +#include "libavutil/intreadwrite.h" + #define SEQ_START_CODE 0x000001b3 #define GOP_START_CODE 0x000001b8 #define PICTURE_START_CODE 0x00000100 @@ -35,14 +37,29 @@ static int mpegvideo_probe(AVProbeData *p) { uint32_t code= -1; int pic=0, seq=0, slice=0, pspack=0, vpes=0, apes=0, res=0, sicle=0; - int i; + int i, j; uint32_t last = 0; for(i=0; i<p->buf_size; i++){ code = (code<<8) + p->buf[i]; if ((code & 0xffffff00) == 0x100) { switch(code){ - case SEQ_START_CODE: seq++; break; + case SEQ_START_CODE: + if (!(p->buf[i+1+3+1+2] & 0x20)) + break; + j = i; + if (p->buf[j+8] & 2) + j+= 64; + if (j >= p->buf_size) + break; + if (p->buf[j+8] & 1) + j+= 64; + if (j >= p->buf_size) + break; + if (AV_RB24(p->buf + j + 9) & 0xFFFFFE) + break; + seq++; + break; case PICTURE_START_CODE: pic++; break; case PACK_START_CODE: pspack++; break; case 0x1b6: |