summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2009-04-12 20:40:18 +0000
committerMichael Niedermayer <michaelni@gmx.at>2009-04-12 20:40:18 +0000
commitead793358ac8d0a5adbd8cf92b85a139caa8a1e2 (patch)
tree3cb4df8b088e58016827b7cf5623c39ff3998567
parent256299d30233a84e58e472a5147c11774d9ecd05 (diff)
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
-rw-r--r--libavcodec/h264.c5
1 files changed, 4 insertions, 1 deletions
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;
}
}
}