From 5d6e4c160a4a0d71c17e8428123027c747ff0fb3 Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Fri, 12 Nov 2010 11:04:40 +0000 Subject: 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 --- libavcodec/amrnbdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavcodec/amrnbdec.c') diff --git a/libavcodec/amrnbdec.c b/libavcodec/amrnbdec.c index e878019bd2..a7d9fc52c0 100644 --- a/libavcodec/amrnbdec.c +++ b/libavcodec/amrnbdec.c @@ -154,7 +154,7 @@ static av_cold int amrnb_decode_init(AVCodecContext *avctx) AMRContext *p = avctx->priv_data; int i; - avctx->sample_fmt = SAMPLE_FMT_FLT; + avctx->sample_fmt = AV_SAMPLE_FMT_FLT; // p->excitation always points to the same position in p->excitation_buf p->excitation = &p->excitation_buf[PITCH_DELAY_MAX + LP_FILTER_ORDER + 1]; @@ -1044,5 +1044,5 @@ AVCodec amrnb_decoder = { .init = amrnb_decode_init, .decode = amrnb_decode_frame, .long_name = NULL_IF_CONFIG_SMALL("Adaptive Multi-Rate NarrowBand"), - .sample_fmts = (enum SampleFormat[]){SAMPLE_FMT_FLT,SAMPLE_FMT_NONE}, + .sample_fmts = (enum AVSampleFormat[]){AV_SAMPLE_FMT_FLT,AV_SAMPLE_FMT_NONE}, }; -- cgit v1.2.3