On 2013-01-08 15:37:44 +0100, Anton Khirnov wrote:
> ---
> libavcodec/smacker.c | 15 +++++++--------
> 1 file changed, 7 insertions(+), 8 deletions(-)
>
> diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c
> index b20a7b6..38e3306 100644
> --- a/libavcodec/smacker.c
> +++ b/libavcodec/smacker.c
> @@ -358,18 +358,16 @@ static int decode_frame(AVCodecContext *avctx, void
> *data, int *got_frame,
> GetByteContext gb2;
> GetBitContext gb;
> int blocks, blk, bw, bh;
> - int i;
> + int i, ret;
> int stride;
> int flags;
>
> if (avpkt->size <= 769)
> return 0;
>
> - smk->pic.reference = 1;
> - smk->pic.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE
> | FF_BUFFER_HINTS_REUSABLE;
> - if(avctx->reget_buffer(avctx, &smk->pic) < 0){
> + if ((ret = ff_reget_buffer(avctx, &smk->pic)) < 0) {
> av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
> - return -1;
> + return ret;
> }
>
> /* make the palette available on the way out */
> @@ -497,8 +495,10 @@ static int decode_frame(AVCodecContext *avctx, void
> *data, int *got_frame,
>
> }
>
> + if ((ret = av_frame_ref(data, &smk->pic)) < 0)
> + return ret;
> +
> *got_frame = 1;
> - *(AVFrame*)data = smk->pic;
>
> /* always report that the buffer was completely consumed */
> return avpkt->size;
> @@ -548,8 +548,7 @@ static av_cold int decode_end(AVCodecContext *avctx)
> av_freep(&smk->full_tbl);
> av_freep(&smk->type_tbl);
>
> - if (smk->pic.data[0])
> - avctx->release_buffer(avctx, &smk->pic);
> + av_frame_unref(&smk->pic);
>
> return 0;
> }
ok
Janne
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
