[FFmpeg-cvslog] r21674 - trunk/libavcodec/h264_direct.c
michael
subversion
Sun Feb 7 18:15:18 CET 2010
Author: michael
Date: Sun Feb 7 18:15:17 2010
New Revision: 21674
Log:
Factorize setting sub_mb_type out.
Modified:
trunk/libavcodec/h264_direct.c
Modified: trunk/libavcodec/h264_direct.c
==============================================================================
--- trunk/libavcodec/h264_direct.c Sun Feb 7 18:13:59 2010 (r21673)
+++ trunk/libavcodec/h264_direct.c Sun Feb 7 18:15:17 2010 (r21674)
@@ -173,13 +173,12 @@ void ff_h264_pred_direct_motion(H264Cont
b8_stride *= 3;
b4_stride *= 6;
+ sub_mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_8x8 */
if( (mb_type_col[0] & MB_TYPE_16x16_OR_INTRA)
&& (mb_type_col[1] & MB_TYPE_16x16_OR_INTRA)
&& !is_b8x8){
- sub_mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_8x8 */
*mb_type |= MB_TYPE_16x8 |MB_TYPE_L0L1|MB_TYPE_DIRECT2; /* B_16x8 */
}else{
- 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_L0L1;
}
}else{ // AFR/FR -> AFR/FR
More information about the ffmpeg-cvslog
mailing list