diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-06 00:15:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-06 01:09:04 +0200 |
| commit | ee6db0de3760ceb7b7a9968a5322c1d8e8e23861 (patch) | |
| tree | e51bab3d887bab8352e1fd63943113e42edeae2b /libavcodec | |
| parent | 98fe404a94063b28e66f32e8047e20136900f25f (diff) | |
Fix ffmpeg-mt fixme in h264.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 51ca7a4c79..ef8e7a0fd0 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); |