X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fivi_common.h;h=dd060854f347c2026a15b38f5fa14baaf20cce37;hb=f2193569a548fde059eb877661ec8a224c9fae1f;hp=10cca26045f7ba75eb259491e7f4b89892da7499;hpb=2b0cdb7364fbe1e8a7e97d36ba36dc67fb24095e;p=ffmpeg diff --git a/libavcodec/ivi_common.h b/libavcodec/ivi_common.h index 10cca26045f..dd060854f34 100644 --- a/libavcodec/ivi_common.h +++ b/libavcodec/ivi_common.h @@ -51,7 +51,7 @@ typedef struct { /// or "7" for custom one VLC *tab; /// pointer to the table associated with tab_sel - //! the following are used only when tab_sel == 7 + /// the following are used only when tab_sel == 7 IVIHuffDesc cust_desc; /// custom Huffman codebook descriptor VLC cust_tab; /// vlc table for custom codebook } IVIHuffTab; @@ -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 */