[FFmpeg-cvslog] avcodec/hevc: fix () in macros

Michael Niedermayer git at videolan.org
Mon Jun 2 23:06:53 CEST 2014


ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Sun May 25 03:36:03 2014 +0200| [7bce659e18fd907ffc08655f38e9343e16cb1a38] | committer: Michael Niedermayer

avcodec/hevc: fix () in macros

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 70f671c39e53f0e54914185dd3ed5afa6b66708b)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7bce659e18fd907ffc08655f38e9343e16cb1a38
---

 libavcodec/hevc.h |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h
index 4a6620f..a1c76fe 100644
--- a/libavcodec/hevc.h
+++ b/libavcodec/hevc.h
@@ -81,10 +81,10 @@
 #define SAMPLE_CTB(tab, x, y) ((tab)[(y) * min_cb_width + (x)])
 #define SAMPLE_CBF(tab, x, y) ((tab)[((y) & ((1<<log2_trafo_size)-1)) * MAX_CU_SIZE + ((x) & ((1<<log2_trafo_size)-1))])
 
-#define IS_IDR(s) (s->nal_unit_type == NAL_IDR_W_RADL || s->nal_unit_type == NAL_IDR_N_LP)
-#define IS_BLA(s) (s->nal_unit_type == NAL_BLA_W_RADL || s->nal_unit_type == NAL_BLA_W_LP || \
-                   s->nal_unit_type == NAL_BLA_N_LP)
-#define IS_IRAP(s) (s->nal_unit_type >= 16 && s->nal_unit_type <= 23)
+#define IS_IDR(s) ((s)->nal_unit_type == NAL_IDR_W_RADL || (s)->nal_unit_type == NAL_IDR_N_LP)
+#define IS_BLA(s) ((s)->nal_unit_type == NAL_BLA_W_RADL || (s)->nal_unit_type == NAL_BLA_W_LP || \
+                   (s)->nal_unit_type == NAL_BLA_N_LP)
+#define IS_IRAP(s) ((s)->nal_unit_type >= 16 && (s)->nal_unit_type <= 23)
 
 /**
  * Table 7-3: NAL unit type codes



More information about the ffmpeg-cvslog mailing list