RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Michael Niedermayer 2008-08-04 22:59:53 +00:00
parent fa6a6c59e0
commit 301e1057b8
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/h264.c
View File

@ -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 */