On 2013-01-08 15:37:32 +0100, Anton Khirnov wrote:
> ---
> libavcodec/vmnc.c | 15 +++++++--------
> 1 file changed, 7 insertions(+), 8 deletions(-)
>
> diff --git a/libavcodec/vmnc.c b/libavcodec/vmnc.c
> index 4071cdf..41e4730 100644
> --- a/libavcodec/vmnc.c
> +++ b/libavcodec/vmnc.c
> @@ -31,6 +31,7 @@
> #include "libavutil/common.h"
> #include "libavutil/intreadwrite.h"
> #include "avcodec.h"
> +#include "internal.h"
>
> enum EncTypes {
> MAGIC_WMVd = 0x574D5664,
> @@ -293,13 +294,11 @@ static int decode_frame(AVCodecContext *avctx, void
> *data, int *got_frame,
> VmncContext * const c = avctx->priv_data;
> uint8_t *outptr;
> const uint8_t *src = buf;
> - int dx, dy, w, h, depth, enc, chunks, res, size_left;
> + int dx, dy, w, h, depth, enc, chunks, res, size_left, ret;
>
> - c->pic.reference = 1;
> - c->pic.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE |
> FF_BUFFER_HINTS_REUSABLE;
> - if(avctx->reget_buffer(avctx, &c->pic) < 0){
> + if ((ret = ff_reget_buffer(avctx, &c->pic)) < 0) {
> av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
> - return -1;
> + return ret;
> }
>
> c->pic.key_frame = 0;
> @@ -448,7 +447,8 @@ static int decode_frame(AVCodecContext *avctx, void
> *data, int *got_frame,
> }
> }
> *got_frame = 1;
> - *(AVFrame*)data = c->pic;
> + if ((ret = av_frame_ref(data, &c->pic)) < 0)
> + return ret;
>
> /* always report that the buffer was completely consumed */
> return buf_size;
> @@ -502,8 +502,7 @@ static av_cold int decode_end(AVCodecContext *avctx)
> {
> VmncContext * const c = avctx->priv_data;
>
> - if (c->pic.data[0])
> - avctx->release_buffer(avctx, &c->pic);
> + av_frame_unref(&c->pic);
>
> av_free(c->curbits);
> av_free(c->curmask);
ok
Janne
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
