[FFmpeg-devel] [PATCH 2/3] Rename remaining occurrences of SAMPLE_FMT_* to AV_SAMPLE_FMT_*

[Måns Rullgård]

Anton Khirnov <anton at khirnov.net> writes:

> ---
>  libavcodec/amrwbdec.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/libavcodec/amrwbdec.c b/libavcodec/amrwbdec.c
> index 1735c29..90bf1d5 100644
> --- 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);
>
> @@ -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},
>  };
> -- 

OK and queued.  However, that (enum ...) should have a const added to
it, along with the same change in a few other places.

-- 
M?ns Rullg?rd
mans at mansr.com