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/aacdec.c | |
| 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/aacdec.c')
| -rw-r--r-- | libavcodec/aacdec.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index c6e5951c6a..fa527da37c 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -545,7 +545,7 @@ static av_cold int aac_decode_init(AVCodecContext *avctx) return -1; } - avctx->sample_fmt = SAMPLE_FMT_S16; + avctx->sample_fmt = AV_SAMPLE_FMT_S16; AAC_INIT_VLC_STATIC( 0, 304); AAC_INIT_VLC_STATIC( 1, 270); @@ -2369,8 +2369,8 @@ AVCodec aac_decoder = { aac_decode_close, aac_decode_frame, .long_name = NULL_IF_CONFIG_SMALL("Advanced Audio Coding"), - .sample_fmts = (const enum SampleFormat[]) { - SAMPLE_FMT_S16,SAMPLE_FMT_NONE + .sample_fmts = (const enum AVSampleFormat[]) { + AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE }, .channel_layouts = aac_channel_layout, }; @@ -2389,8 +2389,8 @@ AVCodec aac_latm_decoder = { .close = aac_decode_close, .decode = latm_decode_frame, .long_name = NULL_IF_CONFIG_SMALL("AAC LATM (Advanced Audio Codec LATM syntax)"), - .sample_fmts = (const enum SampleFormat[]) { - SAMPLE_FMT_S16,SAMPLE_FMT_NONE + .sample_fmts = (const enum AVSampleFormat[]) { + AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE }, .channel_layouts = aac_channel_layout, }; |