opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-06-29 04:17:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ensure that extradata is not parsed twice.

Browse Source 
Fixes FRExt1_Panasonic.

Originally committed as revision 15361 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer
2008-09-18 15:13:15 +00:00
parent 3a9a15c4f3
commit d464bceff2
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/h264.c
View File

@ -7547,9 +7547,10 @@ static int decode_frame(AVCodecContext *avctx,
h->got_avcC = 1; 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) if(decode_nal_units(h, s->avctx->extradata, s->avctx->extradata_size) < 0)
return -1; return -1;
h->got_avcC = 1;
} }
buf_index=decode_nal_units(h, buf, buf_size); buf_index=decode_nal_units(h, buf, buf_size);