diff options
| author | Michael Niedermayer | 2012-04-22 22:26:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer | 2012-04-22 22:26:42 +0200 |
| commit | 92ef4be4ab9fbb7d901b22e0036a4ca90b00a476 (patch) | |
| tree | c04ededf84f089de4f9ef417ca6ecc715b84fa4b /cmdutils.c | |
| parent | 2e07f42957666df6d7c63a62263b8447e97b1442 (diff) | |
| parent | d526c5338d50d12a54fd95130030c60070707d3e (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ARM: allow runtime masking of CPU features
dsputil: remove unused functions
mov: Treat keyframe indexes as 1-origin if starting at non-zero.
mov: Take stps entries into consideration also about key_off.
Remove lowres video decoding
Conflicts:
ffmpeg.c
ffplay.c
libavcodec/arm/vp8dsp_init_arm.c
libavcodec/libopenjpegdec.c
libavcodec/mjpegdec.c
libavcodec/mpegvideo.c
libavcodec/utils.c
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils.c')
| -rw-r--r-- | cmdutils.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/cmdutils.c b/cmdutils.c index 758a9a041c..fb4e869f2e 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -565,6 +565,14 @@ int opt_cpuflags(const char *opt, const char *arg) { "fma4" , NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_FMA4 }, .unit = "flags" }, { "3dnow" , NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_3DNOW }, .unit = "flags" }, { "3dnowext", NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_3DNOWEXT }, .unit = "flags" }, + + { "armv5te", NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_ARMV5TE }, .unit = "flags" }, + { "armv6", NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_ARMV6 }, .unit = "flags" }, + { "armv6t2", NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_ARMV6T2 }, .unit = "flags" }, + { "vfp", NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_VFP }, .unit = "flags" }, + { "vfpv3", NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_VFPV3 }, .unit = "flags" }, + { "neon", NULL, 0, AV_OPT_TYPE_CONST, { AV_CPU_FLAG_NEON }, .unit = "flags" }, + { NULL }, }; static const AVClass class = { |