On Wed, 9 Jan 2013 12:12:06 -0500, Justin Ruggles <[email protected]> wrote: > --- > libavcodec/smacker.c | 23 ++++++----------------- > 1 files changed, 6 insertions(+), 17 deletions(-) > > diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c > index b20a7b6..bc75a17 100644 > --- a/libavcodec/smacker.c > +++ b/libavcodec/smacker.c > @@ -555,14 +555,8 @@ static av_cold int decode_end(AVCodecContext *avctx) > } > > > -typedef struct SmackerAudioContext { > - AVFrame frame; > -} SmackerAudioContext; > - > static av_cold int smka_decode_init(AVCodecContext *avctx) > { > - SmackerAudioContext *s = avctx->priv_data; > - > if (avctx->channels < 1 || avctx->channels > 2) { > av_log(avctx, AV_LOG_ERROR, "invalid number of channels\n"); > return AVERROR(EINVAL); > @@ -570,9 +564,6 @@ static av_cold int smka_decode_init(AVCodecContext *avctx) > avctx->channel_layout = (avctx->channels==2) ? AV_CH_LAYOUT_STEREO : > AV_CH_LAYOUT_MONO; > avctx->sample_fmt = avctx->bits_per_coded_sample == 8 ? AV_SAMPLE_FMT_U8 > : AV_SAMPLE_FMT_S16; > > - avcodec_get_frame_defaults(&s->frame); > - avctx->coded_frame = &s->frame; > - > return 0; > } > > @@ -582,7 +573,7 @@ static av_cold int smka_decode_init(AVCodecContext *avctx) > static int smka_decode_frame(AVCodecContext *avctx, void *data, > int *got_frame_ptr, AVPacket *avpkt) > { > - SmackerAudioContext *s = avctx->priv_data; > + AVFrame *frame = data; > const uint8_t *buf = avpkt->data; > int buf_size = avpkt->size; > GetBitContext gb; > @@ -622,13 +613,13 @@ static int smka_decode_frame(AVCodecContext *avctx, > void *data, > } > > /* get output buffer */ > - s->frame.nb_samples = unp_size / (avctx->channels * (bits + 1)); > - if ((ret = ff_get_buffer(avctx, &s->frame)) < 0) { > + frame->nb_samples = unp_size / (avctx->channels * (bits + 1)); > + if ((ret = ff_get_buffer(avctx, frame)) < 0) { > av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); > return ret; > } > - samples = (int16_t *)s->frame.data[0]; > - samples8 = s->frame.data[0]; > + samples = (int16_t *)frame->data[0]; > + samples8 = frame->data[0]; > > // Initialize > for(i = 0; i < (1 << (bits + stereo)); i++) { > @@ -717,8 +708,7 @@ static int smka_decode_frame(AVCodecContext *avctx, void > *data, > av_free(h[i].values); > } > > - *got_frame_ptr = 1; > - *(AVFrame *)data = s->frame; > + *got_frame_ptr = 1; > > return buf_size; > } > @@ -739,7 +729,6 @@ AVCodec ff_smackaud_decoder = { > .name = "smackaud", > .type = AVMEDIA_TYPE_AUDIO, > .id = AV_CODEC_ID_SMACKAUDIO, > - .priv_data_size = sizeof(SmackerAudioContext), > .init = smka_decode_init, > .decode = smka_decode_frame, > .capabilities = CODEC_CAP_DR1, > -- > 1.7.1
Ok. -- Anton Khirnov _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
