mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
h264: fix midstream extardata handling with dump.f4v
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
484b1cdd53
commit
a4755df523
@ -4075,8 +4075,28 @@ static int decode_frame(AVCodecContext *avctx,
|
||||
|
||||
return 0;
|
||||
}
|
||||
if(h->is_avc && buf_size >= 9 && AV_RB32(buf)==0x0164001F && buf[5] && buf[8]==0x67)
|
||||
if(h->is_avc && buf_size >= 9 && buf[0]==1 && buf[2]==0 && (buf[4]&0xFC)==0xFC && (buf[5]&0x1F) && buf[8]==0x67){
|
||||
int cnt= buf[5]&0x1f;
|
||||
uint8_t *p= buf+6;
|
||||
while(cnt--){
|
||||
int nalsize= AV_RB16(p) + 2;
|
||||
if(nalsize > buf_size - (p-buf) || p[2]!=0x67)
|
||||
goto not_extra;
|
||||
p += nalsize;
|
||||
}
|
||||
cnt = *(p++);
|
||||
if(!cnt)
|
||||
goto not_extra;
|
||||
while(cnt--){
|
||||
int nalsize= AV_RB16(p) + 2;
|
||||
if(nalsize > buf_size - (p-buf) || p[2]!=0x68)
|
||||
goto not_extra;
|
||||
p += nalsize;
|
||||
}
|
||||
|
||||
return ff_h264_decode_extradata(h, buf, buf_size);
|
||||
}
|
||||
not_extra:
|
||||
|
||||
buf_index=decode_nal_units(h, buf, buf_size);
|
||||
if(buf_index < 0)
|
||||
|
Loading…
Reference in New Issue
Block a user