On 2013-01-08 15:37:23 +0100, Anton Khirnov wrote:
> ---
> libavcodec/jvdec.c | 13 +++++++------
> 1 file changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/libavcodec/jvdec.c b/libavcodec/jvdec.c
> index 8c919d2..6b82c6a 100644
> --- a/libavcodec/jvdec.c
> +++ b/libavcodec/jvdec.c
> @@ -28,6 +28,7 @@
> #include "avcodec.h"
> #include "dsputil.h"
> #include "get_bits.h"
> +#include "internal.h"
> #include "libavutil/intreadwrite.h"
>
> typedef struct JvContext {
> @@ -136,16 +137,16 @@ static int decode_frame(AVCodecContext *avctx,
> int buf_size = avpkt->size;
> const uint8_t *buf = avpkt->data;
> const uint8_t *buf_end = buf + buf_size;
> - int video_size, video_type, i, j;
> + int video_size, video_type, i, j, ret;
>
> video_size = AV_RL32(buf);
> video_type = buf[4];
> buf += 5;
>
> if (video_size) {
> - if (avctx->reget_buffer(avctx, &s->frame) < 0) {
> + if ((ret = ff_reget_buffer(avctx, &s->frame)) < 0) {
> av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
> - return -1;
> + return ret;
> }
>
> if (video_type == 0 || video_type == 1) {
> @@ -185,8 +186,9 @@ static int decode_frame(AVCodecContext *avctx,
> s->palette_has_changed = 0;
> memcpy(s->frame.data[1], s->palette, AVPALETTE_SIZE);
>
> + if ((ret = av_frame_ref(data, &s->frame)) < 0)
> + return ret;
> *got_frame = 1;
> - *(AVFrame*)data = s->frame;
> }
>
> return buf_size;
> @@ -196,8 +198,7 @@ static av_cold int decode_close(AVCodecContext *avctx)
> {
> JvContext *s = avctx->priv_data;
>
> - if(s->frame.data[0])
> - avctx->release_buffer(avctx, &s->frame);
> + av_frame_unref(&s->frame);
>
> return 0;
> }
ok
Janne
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
