virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Move direct_dist_scale_factor() and direct_ref_list_init() after fill_mbaff_ref_list()

Browse Source 
as future changes will need the mbaff lists inited.

Originally committed as revision 15374 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer
2008-09-21 02:23:51 +00:00
parent 078f42ddae
commit 8f56e219b2
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/h264.c
View File

@@ -2919,9 +2919,6 @@ static int decode_ref_pic_list_reordering(H264Context *h){
} }
} }
if(h->slice_type_nos==FF_B_TYPE && !h->direct_spatial_mv_pred)
direct_dist_scale_factor(h);
direct_ref_list_init(h);
return 0; return 0;
} }
@@ -3913,6 +3910,10 @@ static int decode_slice_header(H264Context *h, H264Context *h0){
if(FRAME_MBAFF) if(FRAME_MBAFF)
fill_mbaff_ref_list(h); fill_mbaff_ref_list(h);
if(h->slice_type_nos==FF_B_TYPE && !h->direct_spatial_mv_pred)
direct_dist_scale_factor(h);
direct_ref_list_init(h);
if( h->slice_type_nos != FF_I_TYPE && h->pps.cabac ){ if( h->slice_type_nos != FF_I_TYPE && h->pps.cabac ){
tmp = get_ue_golomb(&s->gb); tmp = get_ue_golomb(&s->gb);
if(tmp > 2){ if(tmp > 2){