diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-31 01:16:45 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-31 01:16:45 +0100 |
commit | 1a6a088f7c7b164042ad16d43d05543ce1bacfa4 (patch) | |
tree | ad29c28f8c42f776f85a65cef87ed625c1a302e2 /libavcodec/ivi_common.h | |
parent | e146ad95d79b1a6e6b9e566366b832825c79679f (diff) | |
parent | 9afc025bff4e3a517105a69ec5009ac66b38f483 (diff) | |
download | ffmpeg-streaming-1a6a088f7c7b164042ad16d43d05543ce1bacfa4.zip ffmpeg-streaming-1a6a088f7c7b164042ad16d43d05543ce1bacfa4.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: whitespace cosmetics
fate: split off video codec FATE tests into their own file
fate: split off audio codec FATE tests into their own file
fate: split off Electronic Arts codec FATE tests into their own file
fate: split off QuickTime codec FATE tests into their own file
fate: split off voice codec FATE tests into their own file
fate: split off demuxer FATE tests into their own file
cosmetics: Drop unnecessary parentheses around return values.
fate: drop pointless _audio and _video suffixes from xan tests
qt-faststart: K&R reformatting; fix comment typos
FATE: Add test for H.264 MP4->annex.B bitstream filter.
Conflicts:
ffplay.c
tests/fate.mak
tests/fate/h264.mak
tests/fate/image.mak
tests/fate/lossless-audio.mak
tests/fate/lossless-video.mak
tests/fate/qtrle.mak
tests/fate/real.mak
tests/fate/screen.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ivi_common.h')
-rw-r--r-- | libavcodec/ivi_common.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/ivi_common.h b/libavcodec/ivi_common.h index c4c7c3d..dd06085 100644 --- a/libavcodec/ivi_common.h +++ b/libavcodec/ivi_common.h @@ -195,10 +195,10 @@ typedef struct { /** compare some properties of two pictures */ static inline int ivi_pic_config_cmp(IVIPicConfig *str1, IVIPicConfig *str2) { - return (str1->pic_width != str2->pic_width || str1->pic_height != str2->pic_height || - str1->chroma_width != str2->chroma_width || str1->chroma_height != str2->chroma_height || - str1->tile_width != str2->tile_width || str1->tile_height != str2->tile_height || - str1->luma_bands != str2->luma_bands || str1->chroma_bands != str2->chroma_bands); + return str1->pic_width != str2->pic_width || str1->pic_height != str2->pic_height || + str1->chroma_width != str2->chroma_width || str1->chroma_height != str2->chroma_height || + str1->tile_width != str2->tile_width || str1->tile_height != str2->tile_height || + str1->luma_bands != str2->luma_bands || str1->chroma_bands != str2->chroma_bands; } /** calculate number of tiles in a stride */ |