Mercurial > libavcodec.hg

comparison audioconvert.h @ 12456:a5ddb39627fd libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author stefano
date Sat, 04 Sep 2010 09:59:08 +0000
parents d23e48091c51
children
comparison
equal deleted inserted replaced
12455:14f85520cd02 12456:a5ddb39627fd
27 * @file 27 * @file
28 * Audio format conversion routines 28 * Audio format conversion routines
29 */ 29 */
30 30
31 31
32 #include "libavutil/cpu.h"
32 #include "avcodec.h" 33 #include "avcodec.h"
33 34
34 35
35 /** 36 /**
36 * Generate string corresponding to the sample format with 37 * Generate string corresponding to the sample format with
91 * @param out_fmt Output sample format 92 * @param out_fmt Output sample format
92 * @param out_channels Number of output channels 93 * @param out_channels Number of output channels
93 * @param in_fmt Input sample format 94 * @param in_fmt Input sample format
94 * @param in_channels Number of input channels 95 * @param in_channels Number of input channels
95 * @param[in] matrix Channel mixing matrix (of dimension in_channel*out_channels). Set to NULL to ignore. 96 * @param[in] matrix Channel mixing matrix (of dimension in_channel*out_channels). Set to NULL to ignore.
96 * @param flags See FF_MM_xx 97 * @param flags See AV_CPU_FLAG_xx
97 * @return NULL on error 98 * @return NULL on error
98 */ 99 */
99 AVAudioConvert *av_audio_convert_alloc(enum SampleFormat out_fmt, int out_channels, 100 AVAudioConvert *av_audio_convert_alloc(enum SampleFormat out_fmt, int out_channels,
100 enum SampleFormat in_fmt, int in_channels, 101 enum SampleFormat in_fmt, int in_channels,
101 const float *matrix, int flags); 102 const float *matrix, int flags);