Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGanesh Ajjanagadde <gajjanagadde@gmail.com>2015-10-23 21:29:35 +0300
committerGanesh Ajjanagadde <gajjanagadde@gmail.com>2015-10-30 22:06:19 +0300
commit47af5db721ed5ba70387e28cc4664e3fcb2b3356 (patch)
tree96508a2c1b9e1e563add7708bef072d4d5b4972b /libavformat/cinedec.c
parent191f611906c27f7b1a04955abf0b6f7b7e34a3c7 (diff)
all: fix enum definition for large values
ISO C restricts enumerator values to the range of int. Thus (for instance) 0x80000000 unfortunately does not work, and throws a warning with -Wpedantic on clang 3.7. This fixes it by using alternative expressions that result in identical values but do not have this issue. Tested with FATE. Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com> Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Diffstat (limited to 'libavformat/cinedec.c')
-rw-r--r--libavformat/cinedec.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/cinedec.c b/libavformat/cinedec.c
index 632f46c454..318408436f 100644
--- a/libavformat/cinedec.c
+++ b/libavformat/cinedec.c
@@ -49,13 +49,13 @@ enum {
CFA_VRIV6 = 2, /**< BGGR/GRBG */
CFA_BAYER = 3, /**< GB/RG */
CFA_BAYERFLIP = 4, /**< RG/GB */
-
- CFA_TLGRAY = 0x80000000,
- CFA_TRGRAY = 0x40000000,
- CFA_BLGRAY = 0x20000000,
- CFA_BRGRAY = 0x10000000
};
+#define CFA_TLGRAY 0x80000000U
+#define CFA_TRGRAY 0x40000000U
+#define CFA_BLGRAY 0x20000000U
+#define CFA_BRGRAY 0x10000000U
+
static int cine_read_probe(AVProbeData *p)
{
int HeaderSize;