mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-29 22:00:58 +02:00
Ensure that extradata is not parsed twice.
Fixes FRExt1_Panasonic. Originally committed as revision 15361 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
3a9a15c4f3
commit
d464bceff2
@ -7547,9 +7547,10 @@ static int decode_frame(AVCodecContext *avctx,
|
||||
h->got_avcC = 1;
|
||||
}
|
||||
|
||||
if(avctx->frame_number==0 && !h->is_avc && s->avctx->extradata_size){
|
||||
if(!h->got_avcC && !h->is_avc && s->avctx->extradata_size){
|
||||
if(decode_nal_units(h, s->avctx->extradata, s->avctx->extradata_size) < 0)
|
||||
return -1;
|
||||
h->got_avcC = 1;
|
||||
}
|
||||
|
||||
buf_index=decode_nal_units(h, buf, buf_size);
|
||||
|
Loading…
x
Reference in New Issue
Block a user