diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2008-09-21 02:23:51 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2008-09-21 02:23:51 +0000 |
| commit | 8f56e219b2d31ca56d39f89aa6c6a1be1d86509f (patch) | |
| tree | 81887425ffa3faf6edffdf773ee83811d359aff6 | |
| parent | 078f42ddae70007d24c2bb3cac95f2ceb379314b (diff) | |
| download | ffmpeg-8f56e219b2d31ca56d39f89aa6c6a1be1d86509f.tar.gz | |
Move direct_dist_scale_factor() and direct_ref_list_init() after fill_mbaff_ref_list()
as future changes will need the mbaff lists inited.
Originally committed as revision 15374 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/h264.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index c99667875e..a8e2c34fd0 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -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; } @@ -3913,6 +3910,10 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ if(FRAME_MBAFF) 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 ){ tmp = get_ue_golomb(&s->gb); if(tmp > 2){ |