On 2013-01-08 15:37:21 +0100, Anton Khirnov wrote:
> ---
> libavcodec/flicvideo.c | 19 +++++++++----------
> 1 file changed, 9 insertions(+), 10 deletions(-)
>
> diff --git a/libavcodec/flicvideo.c b/libavcodec/flicvideo.c
> index f0b5d50..b0a77b1 100644
> --- a/libavcodec/flicvideo.c
> +++ b/libavcodec/flicvideo.c
> @@ -42,6 +42,7 @@
> #include "libavutil/intreadwrite.h"
> #include "avcodec.h"
> #include "bytestream.h"
> +#include "internal.h"
> #include "mathops.h"
>
> #define FLI_256_COLOR 4
> @@ -167,9 +168,7 @@ static int flic_decode_frame_8BPP(AVCodecContext *avctx,
>
> bytestream2_init(&g2, buf, buf_size);
>
> - s->frame.reference = 1;
> - s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE
> | FF_BUFFER_HINTS_REUSABLE;
> - if ((ret = avctx->reget_buffer(avctx, &s->frame)) < 0) {
> + if ((ret = ff_reget_buffer(avctx, &s->frame)) < 0) {
> av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
> return ret;
> }
> @@ -419,8 +418,10 @@ static int flic_decode_frame_8BPP(AVCodecContext *avctx,
> s->new_palette = 0;
> }
>
> + if ((ret = av_frame_ref(data, &s->frame)) < 0)
> + return ret;
> +
> *got_frame = 1;
> - *(AVFrame*)data = s->frame;
>
> return buf_size;
> }
> @@ -458,9 +459,7 @@ static int flic_decode_frame_15_16BPP(AVCodecContext
> *avctx,
>
> bytestream2_init(&g2, buf, buf_size);
>
> - s->frame.reference = 1;
> - s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE
> | FF_BUFFER_HINTS_REUSABLE;
> - if ((ret = avctx->reget_buffer(avctx, &s->frame)) < 0) {
> + if ((ret = ff_reget_buffer(avctx, &s->frame)) < 0) {
> av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
> return ret;
> }
> @@ -680,9 +679,10 @@ static int flic_decode_frame_15_16BPP(AVCodecContext
> *avctx,
> av_log(avctx, AV_LOG_ERROR, "Processed FLI chunk where chunk size =
> %d " \
> "and final chunk ptr = %d\n", buf_size,
> bytestream2_tell(&g2));
>
> + if ((ret = av_frame_ref(data, &s->frame)) < 0)
> + return ret;
>
> *got_frame = 1;
> - *(AVFrame*)data = s->frame;
>
> return buf_size;
> }
> @@ -728,8 +728,7 @@ static av_cold int flic_decode_end(AVCodecContext *avctx)
> {
> FlicDecodeContext *s = avctx->priv_data;
>
> - if (s->frame.data[0])
> - avctx->release_buffer(avctx, &s->frame);
> + av_frame_unref(&s->frame);
>
> return 0;
> }
lgtm
Janne
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
