On Wed, 9 Jan 2013 12:11:52 -0500, Justin Ruggles <[email protected]> wrote: > --- > libavcodec/mace.c | 16 +++++----------- > 1 files changed, 5 insertions(+), 11 deletions(-) > > diff --git a/libavcodec/mace.c b/libavcodec/mace.c > index c78a207..368e5d7 100644 > --- a/libavcodec/mace.c > +++ b/libavcodec/mace.c > @@ -155,7 +155,6 @@ typedef struct ChannelData { > } ChannelData; > > typedef struct MACEContext { > - AVFrame frame; > ChannelData chd[2]; > } MACEContext; > > @@ -227,21 +226,17 @@ static void chomp6(ChannelData *chd, int16_t *output, > uint8_t val, int tab_idx) > > static av_cold int mace_decode_init(AVCodecContext * avctx) > { > - MACEContext *ctx = avctx->priv_data; > - > if (avctx->channels > 2) > return -1; > avctx->sample_fmt = AV_SAMPLE_FMT_S16P; > > - avcodec_get_frame_defaults(&ctx->frame); > - avctx->coded_frame = &ctx->frame; > - > return 0; > } > > static int mace_decode_frame(AVCodecContext *avctx, void *data, > int *got_frame_ptr, AVPacket *avpkt) > { > + AVFrame *frame = data; > const uint8_t *buf = avpkt->data; > int buf_size = avpkt->size; > int16_t **samples; > @@ -250,12 +245,12 @@ static int mace_decode_frame(AVCodecContext *avctx, > void *data, > int is_mace3 = (avctx->codec_id == AV_CODEC_ID_MACE3); > > /* get output buffer */ > - ctx->frame.nb_samples = 3 * (buf_size << (1 - is_mace3)) / > avctx->channels; > - if ((ret = ff_get_buffer(avctx, &ctx->frame)) < 0) { > + frame->nb_samples = 3 * (buf_size << (1 - is_mace3)) / avctx->channels; > + if ((ret = ff_get_buffer(avctx, frame)) < 0) { > av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); > return ret; > } > - samples = (int16_t **)ctx->frame.extended_data; > + samples = (int16_t **)frame->extended_data; > > for(i = 0; i < avctx->channels; i++) { > int16_t *output = samples[i]; > @@ -279,8 +274,7 @@ static int mace_decode_frame(AVCodecContext *avctx, void > *data, > } > } > > - *got_frame_ptr = 1; > - *(AVFrame *)data = ctx->frame; > + *got_frame_ptr = 1; > > return buf_size; > } > -- > 1.7.1 >
Ok. -- Anton Khirnov _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
