mirror of https://git.ffmpeg.org/ffmpeg.git
avformat/avidec: use avpriv_find_start_code in avi_read_packet()
Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
e3f5b6f16d
commit
bf696e265a
|
@ -36,6 +36,7 @@
|
|||
#include "riff.h"
|
||||
#include "libavcodec/bytestream.h"
|
||||
#include "libavcodec/exif.h"
|
||||
#include "libavcodec/internal.h"
|
||||
#include "libavformat/isom.h"
|
||||
|
||||
typedef struct AVIStream {
|
||||
|
@ -1446,17 +1447,16 @@ FF_ENABLE_DEPRECATION_WARNINGS
|
|||
if (index >= 0 && e->timestamp == ast->frame_offset) {
|
||||
if (index == st->nb_index_entries-1) {
|
||||
int key=1;
|
||||
int i;
|
||||
uint32_t state=-1;
|
||||
for (i=0; i<FFMIN(size,256); i++) {
|
||||
if (st->codec->codec_id == AV_CODEC_ID_MPEG4) {
|
||||
if (state == 0x1B6) {
|
||||
key= !(pkt->data[i]&0xC0);
|
||||
const uint8_t *ptr = pkt->data, *end = ptr + FFMIN(size, 256);
|
||||
while (ptr < end) {
|
||||
ptr = avpriv_find_start_code(ptr, end, &state);
|
||||
if (state == 0x1B6 && ptr < end) {
|
||||
key = !(*ptr & 0xC0);
|
||||
break;
|
||||
}
|
||||
}else
|
||||
break;
|
||||
state= (state<<8) + pkt->data[i];
|
||||
}
|
||||
}
|
||||
if (!key)
|
||||
e->flags &= ~AVINDEX_KEYFRAME;
|
||||
|
|
Loading…
Reference in New Issue