Mercurial > libavcodec.hg

changeset 11091:74748a220032 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Factorize setting sub_mb_type out.
author michael
date Sun, 07 Feb 2010 17:15:17 +0000
parents eda7b4f6db51
children 64c36264b13f
files h264_direct.c
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/h264_direct.c	Sun Feb 07 15:13:56 2010 +0000
+++ b/h264_direct.c	Sun Feb 07 17:15:17 2010 +0000
@@ -173,13 +173,12 @@
             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