Download-Tools/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-12 04:44:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Try to fix crashes introduced by r25218

Browse Source 
r25218 made assumptions about the existence of past reference frames that
weren't necessarily true.

Originally committed as revision 25243 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Jason Garrett-Glaser 2010-09-28 09:06:22 +00:00
parent 01d461980e
commit 4dece8c7f8
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavcodec/h264.c
View File

@ -1898,6 +1898,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0){
if(h0->current_slice == 0){ if(h0->current_slice == 0){
while(h->frame_num != h->prev_frame_num && while(h->frame_num != h->prev_frame_num &&
h->frame_num != (h->prev_frame_num+1)%(1<<h->sps.log2_max_frame_num)){ h->frame_num != (h->prev_frame_num+1)%(1<<h->sps.log2_max_frame_num)){
Picture *prev = h->short_ref_count ? h->short_ref[0] : NULL;
av_log(h->s.avctx, AV_LOG_DEBUG, "Frame num gap %d %d\n", h->frame_num, h->prev_frame_num); av_log(h->s.avctx, AV_LOG_DEBUG, "Frame num gap %d %d\n", h->frame_num, h->prev_frame_num);
if (ff_h264_frame_start(h) < 0) if (ff_h264_frame_start(h) < 0)
return -1; return -1;
@ -1912,11 +1913,15 @@ static int decode_slice_header(H264Context *h, H264Context *h0){
* FIXME: this doesn't copy padding for out-of-frame motion vectors. Given we're * FIXME: this doesn't copy padding for out-of-frame motion vectors. Given we're
* concealing a lost frame, this probably isn't noticable by comparison, but it should * concealing a lost frame, this probably isn't noticable by comparison, but it should
* be fixed. */ * be fixed. */
av_image_copy(h->short_ref[0]->data, h->short_ref[0]->linesize, if (h->short_ref_count) {
(const uint8_t**)h->short_ref[1]->data, h->short_ref[1]->linesize, if (prev) {
PIX_FMT_YUV420P, s->mb_width*16, s->mb_height*16); av_image_copy(h->short_ref[0]->data, h->short_ref[0]->linesize,
h->short_ref[0]->frame_num = h->prev_frame_num; (const uint8_t**)prev->data, prev->linesize,
h->short_ref[0]->poc = h->short_ref[1]->poc+2; PIX_FMT_YUV420P, s->mb_width*16, s->mb_height*16);
h->short_ref[0]->poc = prev->poc+2;
}
h->short_ref[0]->frame_num = h->prev_frame_num;
}
} }
/* See if we have a decoded first field looking for a pair... */ /* See if we have a decoded first field looking for a pair... */