Mercurial > libavcodec.hg

changeset 7495:2090d67bbf16 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplify y_shift/ref_shift code
author michael
date Tue, 05 Aug 2008 11:17:23 +0000
parents b0a840bb7b12
children f96c14041e48
files h264.c
diffstat 1 files changed, 2 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/h264.c	Tue Aug 05 11:04:49 2008 +0000
+++ b/h264.c	Tue Aug 05 11:17:23 2008 +0000
@@ -1173,17 +1173,8 @@
         }
         if(IS_INTERLACED(*mb_type) != IS_INTERLACED(mb_type_col[0])){
             /* FIXME assumes direct_8x8_inference == 1 */
-            int y_shift;
-            int ref_shift;
-
-            if(IS_INTERLACED(*mb_type)){
-                /* frame to field scaling */
-                y_shift = 0;
-                ref_shift= FRAME_MBAFF ? 0 : 1;
-            }else{
-                y_shift = 2;
-                ref_shift= FRAME_MBAFF ? 2 : 1;
-            }
+            int y_shift  = 2*!IS_INTERLACED(*mb_type);
+            int ref_shift= FRAME_MBAFF ? y_shift : 1;
 
             for(i8=0; i8<4; i8++){
                 const int x8 = i8&1;