diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2010-01-20 01:15:30 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2010-01-20 01:15:30 +0000 |
| commit | 87df989ee366852c5a84eba84daf093449c3c7da (patch) | |
| tree | 32ae3d116e30b742be1227819b68df98c09b7aef /libavcodec/h264_cavlc.c | |
| parent | 55c54371c4cdd2c24240d52ff4ed21045572f767 (diff) | |
| download | ffmpeg-87df989ee366852c5a84eba84daf093449c3c7da.tar.gz | |
Merge multiple IS_* macro uses where possible.
Originally committed as revision 21340 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h264_cavlc.c')
| -rw-r--r-- | libavcodec/h264_cavlc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c index e71ded1e53..b662ee821f 100644 --- a/libavcodec/h264_cavlc.c +++ b/libavcodec/h264_cavlc.c @@ -682,8 +682,7 @@ decode_intra_mb: 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]] = |