Skip to content

F
ffmpeg.wasm-core
Commit 3622988f authored by Loren Merritt's avatar Loren Merritt
Browse files
Options

oops, other half of the vismv patch 

Originally committed as revision 4001 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent b75e10d5
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
libavcodec/h264.c
View file @ 3622988f
...@@ -1077,13 +1077,13 @@ static inline void pred_direct_motion(H264Context * const h, int *mb_type){ ...@@ -1077,13 +1077,13 @@ static inline void pred_direct_motion(H264Context * const h, int *mb_type){
/* FIXME save sub mb types from previous frames (or derive from MVs) /* FIXME save sub mb types from previous frames (or derive from MVs)
* so we know exactly what block size to use */ * so we know exactly what block size to use */
sub_mb_type = MB_TYPE_8x8|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_4x4 */ sub_mb_type = MB_TYPE_8x8|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_4x4 */
*mb_type = MB_TYPE_8x8; *mb_type = MB_TYPE_8x8|MB_TYPE_L0L1;
}else if(!is_b8x8 && (IS_16X16(mb_type_col) || IS_INTRA(mb_type_col))){ }else if(!is_b8x8 && (IS_16X16(mb_type_col) || IS_INTRA(mb_type_col))){
sub_mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_8x8 */ sub_mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_8x8 */
*mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_16x16 */ *mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_16x16 */
}else{ }else{
sub_mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_8x8 */ sub_mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_8x8 */
*mb_type = MB_TYPE_8x8; *mb_type = MB_TYPE_8x8|MB_TYPE_L0L1;
} }
if(!is_b8x8) if(!is_b8x8)
*mb_type |= MB_TYPE_DIRECT2; *mb_type |= MB_TYPE_DIRECT2;
......
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