On 2013-01-08 15:37:18 +0100, Anton Khirnov wrote:
> ---
> libavcodec/frwu.c | 24 ++----------------------
> 1 file changed, 2 insertions(+), 22 deletions(-)
>
> diff --git a/libavcodec/frwu.c b/libavcodec/frwu.c
> index 3f8f6ba..1323727 100644
> --- a/libavcodec/frwu.c
> +++ b/libavcodec/frwu.c
> @@ -32,10 +32,6 @@ static av_cold int decode_init(AVCodecContext *avctx)
> }
> avctx->pix_fmt = AV_PIX_FMT_UYVY422;
>
> - avctx->coded_frame = avcodec_alloc_frame();
> - if (!avctx->coded_frame)
> - return AVERROR(ENOMEM);
> -
> return 0;
> }
>
> @@ -43,13 +39,10 @@ static int decode_frame(AVCodecContext *avctx, void
> *data, int *got_frame,
> AVPacket *avpkt)
> {
> int field, ret;
> - AVFrame *pic = avctx->coded_frame;
> + AVFrame *pic = data;
> const uint8_t *buf = avpkt->data;
> const uint8_t *buf_end = buf + avpkt->size;
>
> - if (pic->data[0])
> - avctx->release_buffer(avctx, pic);
> -
> if (avpkt->size < avctx->width * 2 * avctx->height + 4 + 2*8) {
> av_log(avctx, AV_LOG_ERROR, "Packet is too small.\n");
> return AVERROR_INVALIDDATA;
> @@ -59,8 +52,7 @@ static int decode_frame(AVCodecContext *avctx, void *data,
> int *got_frame,
> return AVERROR_INVALIDDATA;
> }
>
> - pic->reference = 0;
> - if ((ret = ff_get_buffer(avctx, pic)) < 0) {
> + if ((ret = ff_get_buffer(avctx, pic, 0)) < 0) {
> av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
> return ret;
> }
> @@ -98,27 +90,15 @@ static int decode_frame(AVCodecContext *avctx, void
> *data, int *got_frame,
> }
>
> *got_frame = 1;
> - *(AVFrame*)data = *pic;
>
> return avpkt->size;
> }
>
> -static av_cold int decode_close(AVCodecContext *avctx)
> -{
> - AVFrame *pic = avctx->coded_frame;
> - if (pic->data[0])
> - avctx->release_buffer(avctx, pic);
> - av_freep(&avctx->coded_frame);
> -
> - return 0;
> -}
> -
> AVCodec ff_frwu_decoder = {
> .name = "frwu",
> .type = AVMEDIA_TYPE_VIDEO,
> .id = AV_CODEC_ID_FRWU,
> .init = decode_init,
> - .close = decode_close,
> .decode = decode_frame,
> .capabilities = CODEC_CAP_DR1,
> .long_name = NULL_IF_CONFIG_SMALL("Forward Uncompressed"),
ok
Janne
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
