On 2013-01-08 15:37:35 +0100, Anton Khirnov wrote:
> ---
> libavcodec/dsicinav.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/libavcodec/dsicinav.c b/libavcodec/dsicinav.c
> index 39b6a4c..b612dc8 100644
> --- a/libavcodec/dsicinav.c
> +++ b/libavcodec/dsicinav.c
> @@ -282,10 +282,9 @@ static int cinvideo_decode_frame(AVCodecContext *avctx,
> break;
> }
>
> - cin->frame.buffer_hints = FF_BUFFER_HINTS_VALID |
> FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
> - if (avctx->reget_buffer(avctx, &cin->frame)) {
> + if ((res = ff_reget_buffer(avctx, &cin->frame)) < 0) {
> av_log(cin->avctx, AV_LOG_ERROR, "delphinecinvideo: reget_buffer()
> failed to allocate a frame\n");
> - return -1;
> + return res;
> }
>
> memcpy(cin->frame.data[1], cin->palette, sizeof(cin->palette));
> @@ -297,8 +296,10 @@ static int cinvideo_decode_frame(AVCodecContext *avctx,
>
> FFSWAP(uint8_t *, cin->bitmap_table[CIN_CUR_BMP],
> cin->bitmap_table[CIN_PRE_BMP]);
>
> + if ((res = av_frame_ref(data, &cin->frame)) < 0)
> + return res;
> +
> *got_frame = 1;
> - *(AVFrame *)data = cin->frame;
>
> return buf_size;
> }
> @@ -308,8 +309,7 @@ static av_cold int cinvideo_decode_end(AVCodecContext
> *avctx)
> CinVideoContext *cin = avctx->priv_data;
> int i;
>
> - if (cin->frame.data[0])
> - avctx->release_buffer(avctx, &cin->frame);
> + av_frame_unref(&cin->frame);
>
> for (i = 0; i < 3; ++i)
> av_free(cin->bitmap_table[i]);
ok
Janne
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
