aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/mpegvideodec.c
diff options
context:
space:
mode:
authorzhaoxiu.zeng <zhaoxiu.zeng@gmail.com>2015-03-15 16:46:22 +0800
committerMichael Niedermayer <michaelni@gmx.at>2015-03-15 13:28:44 +0100
commit84d8b4fb812c2a7eed31c3abc6bab2ec747b7666 (patch)
tree5384c6a6d271c38bb50bceb71b28c961ef2d1b62 /libavformat/mpegvideodec.c
parent213ddcb0298bd59d0a70c871d0b5dde5065474de (diff)
downloadffmpeg-84d8b4fb812c2a7eed31c3abc6bab2ec747b7666.tar.gz
avformat/mpegvideodec: use avpriv_find_start_code in mpegvideo_probe()
Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpegvideodec.c')
-rw-r--r--libavformat/mpegvideodec.c22
1 files changed, 12 insertions, 10 deletions
diff --git a/libavformat/mpegvideodec.c b/libavformat/mpegvideodec.c
index ade76d860e..5ea5569379 100644
--- a/libavformat/mpegvideodec.c
+++ b/libavformat/mpegvideodec.c
@@ -24,6 +24,7 @@
#include "rawdec.h"
#include "libavutil/intreadwrite.h"
+#include "libavcodec/internal.h"
#define SEQ_START_CODE 0x000001b3
#define GOP_START_CODE 0x000001b8
@@ -37,26 +38,27 @@ 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, j;
+ const uint8_t *ptr = p->buf, *end = ptr + p->buf_size;
uint32_t last = 0;
+ int j;
- for(i=0; i<p->buf_size; i++){
- code = (code<<8) + p->buf[i];
+ while (ptr < end) {
+ ptr = avpriv_find_start_code(ptr, end, &code);
if ((code & 0xffffff00) == 0x100) {
switch(code){
case SEQ_START_CODE:
- if (!(p->buf[i+1+3+1+2] & 0x20))
+ if (!(ptr[3 + 1 + 2] & 0x20))
break;
- j = i;
- if (p->buf[j+8] & 2)
+ j = -1;
+ if (ptr[j + 8] & 2)
j+= 64;
- if (j >= p->buf_size)
+ if (ptr + j >= end)
break;
- if (p->buf[j+8] & 1)
+ if (ptr[j + 8] & 1)
j+= 64;
- if (j >= p->buf_size)
+ if (ptr + j >= end)
break;
- if (AV_RB24(p->buf + j + 9) & 0xFFFFFE)
+ if (AV_RB24(ptr + j + 9) & 0xFFFFFE)
break;
seq++;
break;