diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-07 02:57:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-07 03:22:49 +0100 |
| commit | 6df42f98746be06c883ce683563e07c9a2af983f (patch) | |
| tree | 6bb893aaf179526515cfb3b1cc933721317dcf6f /cmdutils_common_opts.h | |
| parent | 57986c501e8c97d4bd2e1b7ce9e9037c4ae06245 (diff) | |
| parent | b5161908e06b4497bf663510fb495ba97a6fd2b5 (diff) | |
| download | android_external_ffmpeg-6df42f98746be06c883ce683563e07c9a2af983f.tar.gz android_external_ffmpeg-6df42f98746be06c883ce683563e07c9a2af983f.tar.bz2 android_external_ffmpeg-6df42f98746be06c883ce683563e07c9a2af983f.zip | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
SBR DSP: fix SSE code to not use SSE2 instructions.
cpu: initialize mask to -1, so that by default, optimizations are used.
error_resilience: initialize s->block_index[].
svq3: protect against negative quantizers.
Don't use ff_cropTbl[] for IDCT.
swscale: make filterPos 32bit.
FATE: add CPUFLAGS variable, mapping to -cpuflags avconv option.
avconv: add -cpuflags option for setting supported cpuflags.
cpu: add av_set_cpu_flags_mask().
libx264: Allow overriding the sliced threads option
avconv: fix counting encoded video size.
Conflicts:
doc/APIchanges
doc/fate.texi
doc/ffmpeg.texi
ffmpeg.c
libavcodec/h264idct_template.c
libavcodec/svq3.c
libavutil/avutil.h
libavutil/cpu.c
libavutil/cpu.h
libswscale/swscale.c
tests/Makefile
tests/fate-run.sh
tests/regression-funcs.sh
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils_common_opts.h')
| -rw-r--r-- | cmdutils_common_opts.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmdutils_common_opts.h b/cmdutils_common_opts.h index 044f63b27c..334dac9d58 100644 --- a/cmdutils_common_opts.h +++ b/cmdutils_common_opts.h @@ -16,4 +16,4 @@ { "debug", HAS_ARG, {(void*)opt_codec_debug}, "set debug flags", "flags" }, { "report", 0, {(void*)opt_report}, "generate a report" }, { "max_alloc", HAS_ARG, {(void*)opt_max_alloc}, "set maximum size of a single allocated block", "bytes" }, - { "cpuflags", HAS_ARG, {(void*)opt_cpuflags}, "force specific cpu flags", "flags" }, + { "cpuflags", HAS_ARG | OPT_EXPERT, {(void*)opt_cpuflags}, "force specific cpu flags", "flags" }, |