diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-05 14:09:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-05 14:09:09 +0200 |
| commit | 99de3df3d321715572a4017806d222e35f3f6ac6 (patch) | |
| tree | c938e894566c8cdcf218e1ea29ef56eb451f4662 /libavutil/cpu.c | |
| parent | d5f65e9d40413b88c5d5dcdd1ef9dabdff478116 (diff) | |
| parent | d58dd4b5b5d31cfd4092e38a5f2c894eee2ab078 (diff) | |
| download | ffmpeg-99de3df3d321715572a4017806d222e35f3f6ac6.tar.gz | |
Merge commit 'd58dd4b5b5d31cfd4092e38a5f2c894eee2ab078'
* commit 'd58dd4b5b5d31cfd4092e38a5f2c894eee2ab078':
avopt: Store defaults for AV_OPT_TYPE_FLAGS in the i64 union member
Conflicts:
libavcodec/libvpxenc.c
libavcodec/options_table.h
libavfilter/vf_drawtext.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/cpu.c')
| -rw-r--r-- | libavutil/cpu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavutil/cpu.c b/libavutil/cpu.c index 7e291c4c76..f651cab64b 100644 --- a/libavutil/cpu.c +++ b/libavutil/cpu.c @@ -64,7 +64,7 @@ int av_parse_cpu_flags(const char *s) #define CPUFLAG_XOP (AV_CPU_FLAG_XOP | CPUFLAG_AVX) #define CPUFLAG_FMA4 (AV_CPU_FLAG_FMA4 | CPUFLAG_AVX) static const AVOption cpuflags_opts[] = { - { "flags" , NULL, 0, AV_OPT_TYPE_FLAGS, { 0 }, INT64_MIN, INT64_MAX, .unit = "flags" }, + { "flags" , NULL, 0, AV_OPT_TYPE_FLAGS, { .i64 = 0 }, INT64_MIN, INT64_MAX, .unit = "flags" }, #if ARCH_PPC { "altivec" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_ALTIVEC }, .unit = "flags" }, #elif ARCH_X86 @@ -114,7 +114,7 @@ int av_parse_cpu_flags(const char *s) int av_parse_cpu_caps(unsigned *flags, const char *s) { static const AVOption cpuflags_opts[] = { - { "flags" , NULL, 0, AV_OPT_TYPE_FLAGS, { 0 }, INT64_MIN, INT64_MAX, .unit = "flags" }, + { "flags" , NULL, 0, AV_OPT_TYPE_FLAGS, { .i64 = 0 }, INT64_MIN, INT64_MAX, .unit = "flags" }, #if ARCH_PPC { "altivec" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = AV_CPU_FLAG_ALTIVEC }, .unit = "flags" }, #elif ARCH_X86 |