]> git.sesse.net Git - ffmpeg/commitdiff
Rename remaining occurrences of SAMPLE_FMT_* to AV_SAMPLE_FMT_*
authorAnton Khirnov <anton@khirnov.net>
Thu, 3 Feb 2011 13:34:01 +0000 (13:34 +0000)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 4 Feb 2011 02:10:12 +0000 (03:10 +0100)
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 151595fe2e06969a83654564a15feb5b9e8aa2c4)

libavcodec/amrwbdec.c

index 1735c29ccca6358ab80d0b4bb6508e1140aa594d..90bf1d5fdf8cabcc383152b3686845f9b7fd902a 100644 (file)
@@ -89,7 +89,7 @@ static av_cold int amrwb_decode_init(AVCodecContext *avctx)
     AMRWBContext *ctx = avctx->priv_data;
     int i;
 
-    avctx->sample_fmt = SAMPLE_FMT_FLT;
+    avctx->sample_fmt = AV_SAMPLE_FMT_FLT;
 
     av_lfg_init(&ctx->prng, 1);
 
@@ -1233,5 +1233,5 @@ AVCodec ff_amrwb_decoder = {
     .init           = amrwb_decode_init,
     .decode         = amrwb_decode_frame,
     .long_name      = NULL_IF_CONFIG_SMALL("Adaptive Multi-Rate WideBand"),
-    .sample_fmts    = (enum AVSampleFormat[]){SAMPLE_FMT_FLT,SAMPLE_FMT_NONE},
+    .sample_fmts    = (enum AVSampleFormat[]){AV_SAMPLE_FMT_FLT,AV_SAMPLE_FMT_NONE},
 };