diff options
author | Jason Garrett-Glaser <darkshikari@gmail.com> | 2010-09-28 13:06:22 +0400 |
---|---|---|
committer | Jason Garrett-Glaser <darkshikari@gmail.com> | 2010-09-28 13:06:22 +0400 |
commit | 4dece8c7f8255fb3c4ad9fb7fd25a8ba7692fd27 (patch) | |
tree | 62a23753b1ec130d47e85281d962c2f31ec501c0 /libavcodec/h264.c | |
parent | 01d461980e3139f43961f8dad8ab2a61cb23a094 (diff) |
Try to fix crashes introduced by r25218
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
Diffstat (limited to 'libavcodec/h264.c')
-rw-r--r-- | libavcodec/h264.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 0b0d96b08d..a6e30df500 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1898,6 +1898,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ if(h0->current_slice == 0){ while(h->frame_num != h->prev_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); if (ff_h264_frame_start(h) < 0) 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 * concealing a lost frame, this probably isn't noticable by comparison, but it should * be fixed. */ - av_image_copy(h->short_ref[0]->data, h->short_ref[0]->linesize, - (const uint8_t**)h->short_ref[1]->data, h->short_ref[1]->linesize, - PIX_FMT_YUV420P, s->mb_width*16, s->mb_height*16); - h->short_ref[0]->frame_num = h->prev_frame_num; - h->short_ref[0]->poc = h->short_ref[1]->poc+2; + if (h->short_ref_count) { + if (prev) { + av_image_copy(h->short_ref[0]->data, h->short_ref[0]->linesize, + (const uint8_t**)prev->data, prev->linesize, + 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... */ |