summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <[email protected]>2014-05-25 03:30:13 +0200
committerMichael Niedermayer <[email protected]>2014-06-02 22:59:49 +0200
commitcb9379065f821bd4c28c0ca7d4fcee0752f4619a (patch)
tree9b2167b057a8244a198e88fe1ec000394dc9c02f
parent4261778dbdb68debf9315be16bf0c913467a3d05 (diff)
avcodec/h264: fix () in macros
Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit af62b42736c00332d39965168b5cc966a06f07d6) Signed-off-by: Michael Niedermayer <[email protected]>
-rw-r--r--libavcodec/h264.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index 840a91d35b..1a106d6762 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -61,10 +61,10 @@
#define MAX_SLICES 16
#ifdef ALLOW_INTERLACE
-#define MB_MBAFF(h) h->mb_mbaff
-#define MB_FIELD(h) h->mb_field_decoding_flag
-#define FRAME_MBAFF(h) h->mb_aff_frame
-#define FIELD_PICTURE(h) (h->picture_structure != PICT_FRAME)
+#define MB_MBAFF(h) (h)->mb_mbaff
+#define MB_FIELD(h) (h)->mb_field_decoding_flag
+#define FRAME_MBAFF(h) (h)->mb_aff_frame
+#define FIELD_PICTURE(h) ((h)->picture_structure != PICT_FRAME)
#define LEFT_MBS 2
#define LTOP 0
#define LBOT 1
@@ -84,12 +84,12 @@
#define FIELD_OR_MBAFF_PICTURE(h) (FRAME_MBAFF(h) || FIELD_PICTURE(h))
#ifndef CABAC
-#define CABAC(h) h->pps.cabac
+#define CABAC(h) (h)->pps.cabac
#endif
-#define CHROMA(h) (h->sps.chroma_format_idc)
-#define CHROMA422(h) (h->sps.chroma_format_idc == 2)
-#define CHROMA444(h) (h->sps.chroma_format_idc == 3)
+#define CHROMA(h) ((h)->sps.chroma_format_idc)
+#define CHROMA422(h) ((h)->sps.chroma_format_idc == 2)
+#define CHROMA444(h) ((h)->sps.chroma_format_idc == 3)
#define EXTENDED_SAR 255