From ead793358ac8d0a5adbd8cf92b85a139caa8a1e2 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 12 Apr 2009 20:40:18 +0000 Subject: [PATCH] Get rid of the non sensical idea of using the current picture for missing reference pictures. Originally committed as revision 18473 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/h264.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index aafbd754a2..313ad2696f 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2950,7 +2950,10 @@ static int decode_ref_pic_list_reordering(H264Context *h){ for(index= 0; index < h->ref_count[list]; index++){ if(!h->ref_list[list][index].data[0]){ av_log(h->s.avctx, AV_LOG_ERROR, "Missing reference picture\n"); - h->ref_list[list][index]= s->current_picture; //FIXME this is not a sensible solution + if(h->default_ref_list[list][0].data[0]) + h->ref_list[list][index]= h->default_ref_list[list][0]; + else + return -1; } } }