diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-22 00:56:07 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-22 00:56:07 +0400 |
| commit | c047afb80c7373c8533f5aeff6413015a814faaf (patch) | |
| tree | b1f31e060532f10412fb8a1d87582d61c1ee1e67 /libavcodec/avcodec.h | |
| parent | 2f06b56382ddd4ae1bbe09fd07f6e7658bfece08 (diff) | |
| parent | 95510be8c35753da8f48062b28b65e7acdab965f (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avcodec: remove AVCodecContext.dsp_mask
avconv: fix a segfault when default encoder for a format doesn't exist.
utvideo: general cosmetics
aac: Handle HE-AACv2 when sniffing a channel order.
movenc: Support high sample rates in isomedia formats by setting the sample rate field in stsd to 0.
xxan: Remove write-only variable in xan_decode_frame_type0().
ivi_common: Initialize a variable at declaration in ff_ivi_decode_blocks().
Conflicts:
ffmpeg.c
libavcodec/utvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index d905a019e0..c3a5192621 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2622,15 +2622,13 @@ typedef struct AVCodecContext { #define FF_IDCT_SIMPLEALPHA 23 #define FF_IDCT_BINK 24 +#if FF_API_DSP_MASK /** - * dsp_mask could be add used to disable unwanted CPU features - * CPU features (i.e. MMX, SSE. ...) - * - * With the FORCE flag you may instead enable given CPU features. - * (Dangerous: Usable in case of misdetection, improper usage however will - * result into program crash.) + * Unused. + * @deprecated use av_set_cpu_flags_mask() instead. */ - unsigned dsp_mask; + attribute_deprecated unsigned dsp_mask; +#endif /** * bits per sample/pixel from the demuxer (needed for huffyuv). |