Mercurial > libavcodec.hg

diff h264_cavlc.c @ 10946:5a23fa01dec1 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge multiple IS_* macro uses where possible.
author michael
date Wed, 20 Jan 2010 01:15:30 +0000
parents b847f02d5b03
children d5320d1acaee
line wrap: on
line diff
--- a/h264_cavlc.c	Wed Jan 20 00:44:03 2010 +0000
+++ b/h264_cavlc.c	Wed Jan 20 01:15:30 2010 +0000
@@ -682,8 +682,7 @@
                 sub_partition_count[i]= b_sub_mb_type_info[ h->sub_mb_type[i] ].partition_count;
                 h->sub_mb_type[i]=      b_sub_mb_type_info[ h->sub_mb_type[i] ].type;
             }
-            if(   IS_DIRECT(h->sub_mb_type[0]) || IS_DIRECT(h->sub_mb_type[1])
-               || IS_DIRECT(h->sub_mb_type[2]) || IS_DIRECT(h->sub_mb_type[3])) {
+            if( IS_DIRECT(h->sub_mb_type[0]|h->sub_mb_type[1]|h->sub_mb_type[2]|h->sub_mb_type[3])) {
                 ff_h264_pred_direct_motion(h, &mb_type);
                 h->ref_cache[0][scan8[4]] =
                 h->ref_cache[1][scan8[4]] =