[FFmpeg-cvslog] Fix ffmpeg-mt fixme in h264.

Michael Niedermayer git at videolan.org
Wed Apr 6 01:16:45 CEST 2011


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr  6 00:15:42 2011 +0200| [ee6db0de3760ceb7b7a9968a5322c1d8e8e23861] | committer: Michael Niedermayer

Fix ffmpeg-mt fixme in h264.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ee6db0de3760ceb7b7a9968a5322c1d8e8e23861
---

 libavcodec/h264.c |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 51ca7a4..ef8e7a0 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -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);



More information about the ffmpeg-cvslog mailing list