diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-11-12 11:04:40 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-11-12 11:04:40 +0000 |
| commit | 5d6e4c160a4a0d71c17e8428123027c747ff0fb3 (patch) | |
| tree | d3132b2b615fe19f3f4b5ad43b095c076320c780 /libavcodec/audioconvert.h | |
| parent | 09f47fa44ebf3f18651397517b49e6f8c5a0e374 (diff) | |
Replace deprecated symbols SAMPLE_FMT_* with AV_SAMPLE_FMT_*, and enum
SampleFormat with AVSampleFormat.
Originally committed as revision 25730 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/audioconvert.h')
| -rw-r--r-- | libavcodec/audioconvert.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/audioconvert.h b/libavcodec/audioconvert.h index e7d262bae5..a1e61c263d 100644 --- a/libavcodec/audioconvert.h +++ b/libavcodec/audioconvert.h @@ -49,7 +49,7 @@ const char *avcodec_get_sample_fmt_name(int sample_fmt); * @deprecated Use av_get_sample_fmt() instead. */ attribute_deprecated -enum SampleFormat avcodec_get_sample_fmt(const char* name); +enum AVSampleFormat avcodec_get_sample_fmt(const char* name); #endif /** @@ -94,8 +94,8 @@ typedef struct AVAudioConvert AVAudioConvert; * @param flags See AV_CPU_FLAG_xx * @return NULL on error */ -AVAudioConvert *av_audio_convert_alloc(enum SampleFormat out_fmt, int out_channels, - enum SampleFormat in_fmt, int in_channels, +AVAudioConvert *av_audio_convert_alloc(enum AVSampleFormat out_fmt, int out_channels, + enum AVSampleFormat in_fmt, int in_channels, const float *matrix, int flags); /** |