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/mpegaudio.h | |
| parent | 09f47fa44ebf3f18651397517b49e6f8c5a0e374 (diff) | |
| download | ffmpeg-5d6e4c160a4a0d71c17e8428123027c747ff0fb3.tar.gz | |
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/mpegaudio.h')
| -rw-r--r-- | libavcodec/mpegaudio.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/mpegaudio.h b/libavcodec/mpegaudio.h index e2ad911b0c..97c7855f06 100644 --- a/libavcodec/mpegaudio.h +++ b/libavcodec/mpegaudio.h @@ -72,19 +72,19 @@ #if CONFIG_FLOAT typedef float OUT_INT; -#define OUT_FMT SAMPLE_FMT_FLT +#define OUT_FMT AV_SAMPLE_FMT_FLT #elif CONFIG_MPEGAUDIO_HP && CONFIG_AUDIO_NONSHORT typedef int32_t OUT_INT; #define OUT_MAX INT32_MAX #define OUT_MIN INT32_MIN #define OUT_SHIFT (WFRAC_BITS + FRAC_BITS - 31) -#define OUT_FMT SAMPLE_FMT_S32 +#define OUT_FMT AV_SAMPLE_FMT_S32 #else typedef int16_t OUT_INT; #define OUT_MAX INT16_MAX #define OUT_MIN INT16_MIN #define OUT_SHIFT (WFRAC_BITS + FRAC_BITS - 15) -#define OUT_FMT SAMPLE_FMT_S16 +#define OUT_FMT AV_SAMPLE_FMT_S16 #endif #if CONFIG_FLOAT |