[FFmpeg-cvslog] r15412 - trunk/libavcodec/h264.c

michael subversion
Thu Sep 25 16:29:35 CEST 2008


Author: michael
Date: Thu Sep 25 16:29:35 2008
New Revision: 15412

Log:
Initialize next/last_picture* as the generic code does not always
set them to sane values.


Modified:
   trunk/libavcodec/h264.c

Modified: trunk/libavcodec/h264.c
==============================================================================
--- trunk/libavcodec/h264.c	(original)
+++ trunk/libavcodec/h264.c	Thu Sep 25 16:29:35 2008
@@ -3925,6 +3925,15 @@ static int decode_slice_header(H264Conte
     if(h->slice_type_nos!=FF_I_TYPE && decode_ref_pic_list_reordering(h) < 0)
         return -1;
 
+    if(h->slice_type_nos!=FF_I_TYPE){
+        s->last_picture_ptr= &h->ref_list[0][0];
+        copy_picture(&s->last_picture, s->last_picture_ptr);
+    }
+    if(h->slice_type_nos==FF_B_TYPE){
+        s->next_picture_ptr= &h->ref_list[1][0];
+        copy_picture(&s->next_picture, s->next_picture_ptr);
+    }
+
     if(   (h->pps.weighted_pred          && h->slice_type_nos == FF_P_TYPE )
        ||  (h->pps.weighted_bipred_idc==1 && h->slice_type_nos== FF_B_TYPE ) )
         pred_weight_table(h);




More information about the ffmpeg-cvslog mailing list