On Wed, 9 Jan 2013 12:11:29 -0500, Justin Ruggles <[email protected]> wrote: > --- > libavcodec/amrwbdec.c | 14 +++++--------- > 1 files changed, 5 insertions(+), 9 deletions(-) > > diff --git a/libavcodec/amrwbdec.c b/libavcodec/amrwbdec.c > index 01d95f6..c5b4ef8 100644 > --- a/libavcodec/amrwbdec.c > +++ b/libavcodec/amrwbdec.c > @@ -43,7 +43,6 @@ > #include "amrwbdata.h" > > typedef struct { > - AVFrame avframe; ///< AVFrame for decoded > samples > AMRWBFrame frame; ///< AMRWB parameters > decoded from bitstream > enum Mode fr_cur_mode; ///< mode index of current > frame > uint8_t fr_quality; ///< frame quality index > (FQI) > @@ -113,9 +112,6 @@ static av_cold int amrwb_decode_init(AVCodecContext > *avctx) > for (i = 0; i < 4; i++) > ctx->prediction_error[i] = MIN_ENERGY; > > - avcodec_get_frame_defaults(&ctx->avframe); > - avctx->coded_frame = &ctx->avframe; > - > return 0; > } > > @@ -1076,6 +1072,7 @@ static int amrwb_decode_frame(AVCodecContext *avctx, > void *data, > int *got_frame_ptr, AVPacket *avpkt) > { > AMRWBContext *ctx = avctx->priv_data; > + AVFrame *frame = data; > AMRWBFrame *cf = &ctx->frame; > const uint8_t *buf = avpkt->data; > int buf_size = avpkt->size; > @@ -1093,12 +1090,12 @@ static int amrwb_decode_frame(AVCodecContext *avctx, > void *data, > int sub, i, ret; > > /* get output buffer */ > - ctx->avframe.nb_samples = 4 * AMRWB_SFR_SIZE_16k; > - if ((ret = ff_get_buffer(avctx, &ctx->avframe)) < 0) { > + frame->nb_samples = 4 * AMRWB_SFR_SIZE_16k; > + if ((ret = ff_get_buffer(avctx, frame)) < 0) { > av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); > return ret; > } > - buf_out = (float *)ctx->avframe.data[0]; > + buf_out = (float *)frame->data[0]; > > header_size = decode_mime_header(ctx, buf); > if (ctx->fr_cur_mode > MODE_SID) { > @@ -1243,8 +1240,7 @@ static int amrwb_decode_frame(AVCodecContext *avctx, > void *data, > memcpy(ctx->isp_sub4_past, ctx->isp[3], LP_ORDER * > sizeof(ctx->isp[3][0])); > memcpy(ctx->isf_past_final, ctx->isf_cur, LP_ORDER * sizeof(float)); > > - *got_frame_ptr = 1; > - *(AVFrame *)data = ctx->avframe; > + *got_frame_ptr = 1; > > return expected_fr_size; > } > -- > 1.7.1 >
Ok. -- Anton Khirnov _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
