diff options
| author | Ganesh Ajjanagadde <gajjanagadde@gmail.com> | 2015-10-23 14:29:35 -0400 |
|---|---|---|
| committer | Ganesh Ajjanagadde <gajjanagadde@gmail.com> | 2015-10-30 15:06:19 -0400 |
| commit | 47af5db721ed5ba70387e28cc4664e3fcb2b3356 (patch) | |
| tree | 96508a2c1b9e1e563add7708bef072d4d5b4972b /libavformat/mov_chan.c | |
| parent | 191f611906c27f7b1a04955abf0b6f7b7e34a3c7 (diff) | |
| download | ffmpeg-47af5db721ed5ba70387e28cc4664e3fcb2b3356.tar.gz | |
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/mov_chan.c')
| -rw-r--r-- | libavformat/mov_chan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mov_chan.c b/libavformat/mov_chan.c index a2fa8d641c..cba07c51e5 100644 --- a/libavformat/mov_chan.c +++ b/libavformat/mov_chan.c @@ -45,7 +45,7 @@ * do not specify a particular ordering of those channels." */ enum MovChannelLayoutTag { - MOV_CH_LAYOUT_UNKNOWN = 0xFFFF0000, +#define MOV_CH_LAYOUT_UNKNOWN 0xFFFF0000 MOV_CH_LAYOUT_USE_DESCRIPTIONS = ( 0 << 16) | 0, MOV_CH_LAYOUT_USE_BITMAP = ( 1 << 16) | 0, MOV_CH_LAYOUT_DISCRETEINORDER = (147 << 16) | 0, |