On Wed, 9 Jan 2013 12:11:57 -0500, Justin Ruggles <[email protected]> wrote: > --- > libavcodec/pcm-mpeg.c | 29 ++++++----------------------- > 1 files changed, 6 insertions(+), 23 deletions(-) > > diff --git a/libavcodec/pcm-mpeg.c b/libavcodec/pcm-mpeg.c > index c8c683d..41bcb3e 100644 > --- a/libavcodec/pcm-mpeg.c > +++ b/libavcodec/pcm-mpeg.c > @@ -121,26 +121,12 @@ static int pcm_bluray_parse_header(AVCodecContext > *avctx, > return 0; > } > > -typedef struct PCMBRDecode { > - AVFrame frame; > -} PCMBRDecode; > - > -static av_cold int pcm_bluray_decode_init(AVCodecContext * avctx) > -{ > - PCMBRDecode *s = avctx->priv_data; > - > - avcodec_get_frame_defaults(&s->frame); > - avctx->coded_frame = &s->frame; > - > - return 0; > -} > - > static int pcm_bluray_decode_frame(AVCodecContext *avctx, void *data, > int *got_frame_ptr, AVPacket *avpkt) > { > + AVFrame *frame = data; > const uint8_t *src = avpkt->data; > int buf_size = avpkt->size; > - PCMBRDecode *s = avctx->priv_data; > GetByteContext gb; > int num_source_channels, channel, retval; > int sample_size, samples; > @@ -165,13 +151,13 @@ static int pcm_bluray_decode_frame(AVCodecContext > *avctx, void *data, > samples = buf_size / sample_size; > > /* get output buffer */ > - s->frame.nb_samples = samples; > - if ((retval = ff_get_buffer(avctx, &s->frame)) < 0) { > + frame->nb_samples = samples; > + if ((retval = ff_get_buffer(avctx, frame)) < 0) { > av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); > return retval; > } > - dst16 = (int16_t *)s->frame.data[0]; > - dst32 = (int32_t *)s->frame.data[0]; > + dst16 = (int16_t *)frame->data[0]; > + dst32 = (int32_t *)frame->data[0]; > > if (samples) { > switch (avctx->channel_layout) { > @@ -305,8 +291,7 @@ static int pcm_bluray_decode_frame(AVCodecContext *avctx, > void *data, > } > } > > - *got_frame_ptr = 1; > - *(AVFrame *)data = s->frame; > + *got_frame_ptr = 1; > > retval = bytestream2_tell(&gb); > if (avctx->debug & FF_DEBUG_BITSTREAM) > @@ -319,8 +304,6 @@ AVCodec ff_pcm_bluray_decoder = { > .name = "pcm_bluray", > .type = AVMEDIA_TYPE_AUDIO, > .id = AV_CODEC_ID_PCM_BLURAY, > - .priv_data_size = sizeof(PCMBRDecode), > - .init = pcm_bluray_decode_init, > .decode = pcm_bluray_decode_frame, > .capabilities = CODEC_CAP_DR1, > .sample_fmts = (const enum AVSampleFormat[]){ > -- > 1.7.1 >
Ok. -- Anton Khirnov _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
