Merge remote branch 'qatar/master'

[ffmpeg] / libavcodec / amrwbdec.c

diff --git a/libavcodec/amrwbdec.c b/libavcodec/amrwbdec.c
index 941d065127a407250c8c9d06a28fef2e2d8bfa35..fa3f8dd05058886a493d277b3d1b17c4ae572c76 100644 (file)
--- a/libavcodec/amrwbdec.c
+++ b/libavcodec/amrwbdec.c
@@ -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);
 
@@ -1225,13 +1225,13 @@ static int amrwb_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
     return expected_fr_size;
 }
 
-AVCodec amrwb_decoder = {
+AVCodec ff_amrwb_decoder = {
     .name           = "amrwb",
-    .type           = CODEC_TYPE_AUDIO,
+    .type           = AVMEDIA_TYPE_AUDIO,
     .id             = CODEC_ID_AMR_WB,
     .priv_data_size = sizeof(AMRWBContext),
     .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    = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_FLT,AV_SAMPLE_FMT_NONE},
 };