Fix ffmpeg-mt fixme in h264.
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 5 Apr 2011 22:15:42 +0000 (00:15 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 5 Apr 2011 23:09:04 +0000 (01:09 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264.c

index 51ca7a4..ef8e7a0 100644 (file)
@@ -2495,9 +2495,6 @@ static int decode_slice_header(H264Context *h, H264Context *h0){
     if(h->slice_type_nos!=FF_I_TYPE && ff_h264_decode_ref_pic_list_reordering(h) < 0)
         return -1;
 
-    //FIXME mt gives valgrind warnings and crashes if this is uncommented
-    /*
-
     if(h->slice_type_nos!=FF_I_TYPE){
         s->last_picture_ptr= &h->ref_list[0][0];
         ff_copy_picture(&s->last_picture, s->last_picture_ptr);
@@ -2507,8 +2504,6 @@ static int decode_slice_header(H264Context *h, H264Context *h0){
         ff_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);