Commit 301e1057 authored by Michael Niedermayer's avatar Michael Niedermayer

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
parent fa6a6c59
...@@ -1150,8 +1150,7 @@ static inline void pred_direct_motion(H264Context * const h, int *mb_type){ ...@@ -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 *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; const int *dist_scale_factor = h->dist_scale_factor;
if(FRAME_MBAFF){ if(FRAME_MBAFF && IS_INTERLACED(*mb_type)){
if(IS_INTERLACED(*mb_type)){
map_col_to_list0[0] = h->map_col_to_list0_field[0]; map_col_to_list0[0] = h->map_col_to_list0_field[0];
map_col_to_list0[1] = h->map_col_to_list0_field[1]; map_col_to_list0[1] = h->map_col_to_list0_field[1];
dist_scale_factor = h->dist_scale_factor_field; dist_scale_factor = h->dist_scale_factor_field;
...@@ -1244,7 +1243,6 @@ static inline void pred_direct_motion(H264Context * const h, int *mb_type){ ...@@ -1244,7 +1243,6 @@ static inline void pred_direct_motion(H264Context * const h, int *mb_type){
} }
return; return;
} }
}
/* one-to-one mv scaling */ /* one-to-one mv scaling */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment