diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2008-08-04 22:59:53 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2008-08-04 22:59:53 +0000 |
| commit | 301e1057b85802640aa98f331680bb50ef373e92 (patch) | |
| tree | e8b2b799b5f164ead9259e395de54bc5ac26f056 /libavcodec | |
| parent | fa6a6c59e0e8ed7533d83281652bf72e17bc1087 (diff) | |
| download | ffmpeg-301e1057b85802640aa98f331680bb50ef373e92.tar.gz | |
The code under FRAME_MBAFF for temporal direct mode MBs is needed for PAFF as well.
Originally committed as revision 14542 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 35a57a2bc5..9eda1f0347 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1150,8 +1150,7 @@ static inline void pred_direct_motion(H264Context * const h, int *mb_type){ const int *map_col_to_list0[2] = {h->map_col_to_list0[0], h->map_col_to_list0[1]}; const int *dist_scale_factor = h->dist_scale_factor; - if(FRAME_MBAFF){ - if(IS_INTERLACED(*mb_type)){ + if(FRAME_MBAFF && IS_INTERLACED(*mb_type)){ map_col_to_list0[0] = h->map_col_to_list0_field[0]; map_col_to_list0[1] = h->map_col_to_list0_field[1]; dist_scale_factor = h->dist_scale_factor_field; @@ -1244,7 +1243,6 @@ static inline void pred_direct_motion(H264Context * const h, int *mb_type){ } return; } - } /* one-to-one mv scaling */ |