diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2016-02-19 18:26:24 -0500 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2016-03-22 16:51:09 -0400 |
| commit | 750562549ceef268b29b94f6a887d9cf331a8c78 (patch) | |
| tree | 60d027d6004b56afb955d8f4fb6ff01a6e20a9ab | |
| parent | 0c6a70873fc6e43194b471d112c30823b6c8d0b4 (diff) | |
| download | ffmpeg-750562549ceef268b29b94f6a887d9cf331a8c78.tar.gz | |
intrax8: Wrap multiline macros in do{}while(0) clauses
These macros are treated like functions, the wrapping simplifies error
checking and avoids deeply nested ifs in the following commit.
| -rw-r--r-- | libavcodec/intrax8.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c index 45fff96888..48876431a8 100644 --- a/libavcodec/intrax8.c +++ b/libavcodec/intrax8.c @@ -61,7 +61,7 @@ static av_cold void x8_vlc_init(void){ static VLC_TYPE table[28150][2]; -#define init_ac_vlc(dst,src) \ +#define init_ac_vlc(dst,src) do { \ dst.table = &table[offset]; \ dst.table_allocated = sizes[sizeidx]; \ offset += sizes[sizeidx++]; \ @@ -69,7 +69,8 @@ static av_cold void x8_vlc_init(void){ AC_VLC_BITS,77, \ &src[1],4,2, \ &src[0],4,2, \ - INIT_VLC_USE_NEW_STATIC) + INIT_VLC_USE_NEW_STATIC); \ + } while(0) //set ac tables for(i=0;i<8;i++){ init_ac_vlc( j_ac_vlc[0][0][i], x8_ac0_highquant_table[i][0] ); @@ -80,7 +81,7 @@ static av_cold void x8_vlc_init(void){ #undef init_ac_vlc //set dc tables -#define init_dc_vlc(dst,src) \ +#define init_dc_vlc(dst,src) do { \ dst.table = &table[offset]; \ dst.table_allocated = sizes[sizeidx]; \ offset += sizes[sizeidx++]; \ @@ -88,7 +89,8 @@ static av_cold void x8_vlc_init(void){ DC_VLC_BITS,34, \ &src[1],4,2, \ &src[0],4,2, \ - INIT_VLC_USE_NEW_STATIC); + INIT_VLC_USE_NEW_STATIC); \ + } while(0) for(i=0;i<8;i++){ init_dc_vlc( j_dc_vlc[0][i], x8_dc_highquant_table[i][0]); init_dc_vlc( j_dc_vlc[1][i], x8_dc_lowquant_table [i][0]); @@ -96,7 +98,7 @@ static av_cold void x8_vlc_init(void){ #undef init_dc_vlc //set orient tables -#define init_or_vlc(dst,src) \ +#define init_or_vlc(dst,src) do { \ dst.table = &table[offset]; \ dst.table_allocated = sizes[sizeidx]; \ offset += sizes[sizeidx++]; \ @@ -104,12 +106,13 @@ static av_cold void x8_vlc_init(void){ OR_VLC_BITS,12, \ &src[1],4,2, \ &src[0],4,2, \ - INIT_VLC_USE_NEW_STATIC); + INIT_VLC_USE_NEW_STATIC); \ + } while(0) for(i=0;i<2;i++){ init_or_vlc( j_orient_vlc[0][i], x8_orient_highquant_table[i][0]); } for(i=0;i<4;i++){ - init_or_vlc( j_orient_vlc[1][i], x8_orient_lowquant_table [i][0]) + init_or_vlc( j_orient_vlc[1][i], x8_orient_lowquant_table [i][0]); } if (offset != sizeof(table)/sizeof(VLC_TYPE)/2) av_log(NULL, AV_LOG_ERROR, "table size %i does not match needed %i\n", (int)(sizeof(table)/sizeof(VLC_TYPE)/2), offset); |