highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix ffmpeg-mt fixme in h264.

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-04-06 00:15:42 +02:00
parent 98fe404a94
commit ee6db0de37
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/h264.c
View 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) if(h->slice_type_nos!=FF_I_TYPE && ff_h264_decode_ref_pic_list_reordering(h) < 0)
return -1; return -1;
//FIXME mt gives valgrind warnings and crashes if this is uncommented
/*
if(h->slice_type_nos!=FF_I_TYPE){ if(h->slice_type_nos!=FF_I_TYPE){
s->last_picture_ptr= &h->ref_list[0][0]; s->last_picture_ptr= &h->ref_list[0][0];
ff_copy_picture(&s->last_picture, s->last_picture_ptr); 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); ff_copy_picture(&s->next_picture, s->next_picture_ptr);
} }
*/
if( (h->pps.weighted_pred && h->slice_type_nos == FF_P_TYPE ) 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 ) ) || (h->pps.weighted_bipred_idc==1 && h->slice_type_nos== FF_B_TYPE ) )
pred_weight_table(h); pred_weight_table(h);