Message ID | AS8P250MB0744F2CAA48EEB4AE287F0178F5A2@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM |
---|---|
State | Accepted |
Commit | c6cf253c98a7839d852f7f707979c8401a26459c |
Headers | show |
Series | [FFmpeg-devel,1/8] avcodec/aacdec_template: Don't use intermediate void* | expand |
Context | Check | Description |
---|---|---|
yinshiyou/make_loongarch64 | success | Make finished |
yinshiyou/make_fate_loongarch64 | success | Make fate finished |
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c index fa2a68535c..cfaa25873f 100644 --- a/libavcodec/aacdec_template.c +++ b/libavcodec/aacdec_template.c @@ -3032,7 +3032,7 @@ static int parse_adts_frame_header(AACContext *ac, GetBitContext *gb) return size; } -static int aac_decode_er_frame(AVCodecContext *avctx, void *data, +static int aac_decode_er_frame(AVCodecContext *avctx, AVFrame *frame, int *got_frame_ptr, GetBitContext *gb) { AACContext *ac = avctx->priv_data; @@ -3046,7 +3046,7 @@ static int aac_decode_er_frame(AVCodecContext *avctx, void *data, if (aot == AOT_ER_AAC_LD || aot == AOT_ER_AAC_ELD) samples >>= 1; - ac->frame = data; + ac->frame = frame; if ((err = frame_configure_elements(avctx)) < 0) return err;
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/aacdec_template.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)