On Wed, 9 Jan 2013 12:12:05 -0500, Justin Ruggles <justin.rugg...@gmail.com>
wrote:
> ---
> libavcodec/sipr.c | 15 ++++++---------
> libavcodec/sipr.h | 1 -
> 2 files changed, 6 insertions(+), 10 deletions(-)
>
> diff --git a/libavcodec/sipr.c b/libavcodec/sipr.c
> index d482b0f..6db529e 100644
> --- a/libavcodec/sipr.c
> +++ b/libavcodec/sipr.c
> @@ -515,9 +515,6 @@ static av_cold int sipr_decoder_init(AVCodecContext *
> avctx)
> avctx->channel_layout = AV_CH_LAYOUT_MONO;
> avctx->sample_fmt = AV_SAMPLE_FMT_FLT;
>
> - avcodec_get_frame_defaults(&ctx->frame);
> - avctx->coded_frame = &ctx->frame;
> -
> return 0;
> }
>
> @@ -525,6 +522,7 @@ static int sipr_decode_frame(AVCodecContext *avctx, void
> *data,
> int *got_frame_ptr, AVPacket *avpkt)
> {
> SiprContext *ctx = avctx->priv_data;
> + AVFrame *frame = data;
> const uint8_t *buf=avpkt->data;
> SiprParameters parm;
> const SiprModeParam *mode_par = &modes[ctx->mode];
> @@ -542,13 +540,13 @@ static int sipr_decode_frame(AVCodecContext *avctx,
> void *data,
> }
>
> /* get output buffer */
> - ctx->frame.nb_samples = mode_par->frames_per_packet * subframe_size *
> - mode_par->subframe_count;
> - if ((ret = ff_get_buffer(avctx, &ctx->frame)) < 0) {
> + frame->nb_samples = mode_par->frames_per_packet * subframe_size *
> + mode_par->subframe_count;
> + if ((ret = ff_get_buffer(avctx, frame)) < 0) {
> av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
> return ret;
> }
> - samples = (float *)ctx->frame.data[0];
> + samples = (float *)frame->data[0];
>
> init_get_bits(&gb, buf, mode_par->bits_per_frame);
>
> @@ -560,8 +558,7 @@ static int sipr_decode_frame(AVCodecContext *avctx, void
> *data,
> samples += subframe_size * mode_par->subframe_count;
> }
>
> - *got_frame_ptr = 1;
> - *(AVFrame *)data = ctx->frame;
> + *got_frame_ptr = 1;
>
> return mode_par->bits_per_frame >> 3;
> }
> diff --git a/libavcodec/sipr.h b/libavcodec/sipr.h
> index 5007c75..1a35cdb 100644
> --- a/libavcodec/sipr.h
> +++ b/libavcodec/sipr.h
> @@ -65,7 +65,6 @@ typedef struct SiprParameters {
>
> typedef struct SiprContext {
> AVCodecContext *avctx;
> - AVFrame frame;
>
> SiprMode mode;
>
> --
> 1.7.1
>
Ok.
--
Anton Khirnov
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
