> On Mar 11, 2025, at 17:25, joney...@gmail.com wrote:
>
> From: Jingwei Yao <joney...@gmail.com>
>
> Signed-off-by: Jingwei Yao <joney...@gmail.com>
> ---
> libavcodec/pcm.c | 12 ++++++++++--
> 1 file changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c
> index a23293dca2..e04ca78101 100644
> --- a/libavcodec/pcm.c
> +++ b/libavcodec/pcm.c
> @@ -252,8 +252,10 @@ typedef struct PCMDecode {
> static av_cold int pcm_decode_init(AVCodecContext *avctx)
> {
> PCMDecode *s = avctx->priv_data;
> + const enum AVSampleFormat *sample_fmts;
> AVFloatDSPContext *fdsp;
> - int i;
> + int num_sample_fmts;
> + int i, ret;
>
> switch (avctx->codec_id) {
> case AV_CODEC_ID_PCM_ALAW:
> @@ -284,7 +286,13 @@ static av_cold int pcm_decode_init(AVCodecContext *avctx)
> break;
> }
>
> - avctx->sample_fmt = avctx->codec->sample_fmts[0];
> + ret = avcodec_get_supported_config(avctx, NULL,
> AV_CODEC_CONFIG_SAMPLE_FORMAT,
> + 0, (const void**)&sample_fmts,
> &num_sample_fmts);
> + if (ret < 0)
> + return ret;
> +
> + if (sample_fmts)
> + avctx->sample_fmt = sample_fmts[0];
How about just disable the warning with FF_DISABLE_DEPRECATION_WARNINGS?
sample_fmts should be moved to FFCodec finally. So we can fix it finally by
avctx->sample_fmt = ffcodec(avctx->codec)->sample_fmts[0];
It doesn’t worth the trouble and complexity to get some information which is
only an array
in current translation unit.
>
> if (avctx->sample_fmt == AV_SAMPLE_FMT_S32)
> avctx->bits_per_raw_sample = av_get_bits_per_sample(avctx->codec_id);
> --
> 2.25.1
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
