diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-09-04 09:59:08 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-09-04 09:59:08 +0000 |
| commit | 7160bb716be07254bde383b1b2298eeff6a3e641 (patch) | |
| tree | f01c7a2125ba5e8bdc866a34b401bc4b9724911c /libavcodec/audioconvert.h | |
| parent | 55127e7b494a0221d79501867e9b81ce185ec7b8 (diff) | |
| download | ffmpeg-7160bb716be07254bde383b1b2298eeff6a3e641.tar.gz | |
Rename FF_MM_ symbols related to CPU features flags as AV_CPU_FLAG_
symbols, and move them from libavcodec/avcodec.h to libavutil/cpu.h.
Originally committed as revision 25040 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/audioconvert.h')
| -rw-r--r-- | libavcodec/audioconvert.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/audioconvert.h b/libavcodec/audioconvert.h index 1f93b5c336..349065edc2 100644 --- a/libavcodec/audioconvert.h +++ b/libavcodec/audioconvert.h @@ -29,6 +29,7 @@ */ +#include "libavutil/cpu.h" #include "avcodec.h" @@ -93,7 +94,7 @@ typedef struct AVAudioConvert AVAudioConvert; * @param in_fmt Input sample format * @param in_channels Number of input channels * @param[in] matrix Channel mixing matrix (of dimension in_channel*out_channels). Set to NULL to ignore. - * @param flags See FF_MM_xx + * @param flags See AV_CPU_FLAG_xx * @return NULL on error */ AVAudioConvert *av_audio_convert_alloc(enum SampleFormat out_fmt, int out_channels, |