From: Michael Niedermayer <michaelni@gmx.at>
Date: Sun, 17 Nov 2013 01:09:29 +0000 (+0100)
Subject: Merge commit '3c8ea9d4a74fd4d7493d40c818ca64ee492709f3'
X-Git-Tag: android-x86-6.0-r1~8955
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8af7774c7aca6f3b595d0417b92f543ce0c7b537;p=android-x86%2Fexternal-ffmpeg.git

Merge commit '3c8ea9d4a74fd4d7493d40c818ca64ee492709f3'

* commit '3c8ea9d4a74fd4d7493d40c818ca64ee492709f3':
  vmnc: use the AVFrame API properly.
  xan: use the AVFrame API properly.
  xxan: use the AVFrame API properly.
  zerocodec: use the AVFrame API properly.

Conflicts:
	libavcodec/vmnc.c
	libavcodec/xan.c
	libavcodec/xxan.c

See: cf5ab8b6f71699a48a6384d5e5779630b4be7b56
See: ad438f450b83882a1277a79c1c3d6dfe55573b1c
See: 67607e20e882eb5639a4e9099caecb52a863ab68
Merged-by: Michael Niedermayer <michaelni@gmx.at>
---

8af7774c7aca6f3b595d0417b92f543ce0c7b537
diff --cc libavcodec/vmnc.c
index c1b6d4e85d,16984fbf0f..5f91ab1b31
--- a/libavcodec/vmnc.c
+++ b/libavcodec/vmnc.c
@@@ -320,10 -318,11 +320,9 @@@ static int decode_frame(AVCodecContext 
      GetByteContext *gb = &c->gb;
      uint8_t *outptr;
      int dx, dy, w, h, depth, enc, chunks, res, size_left, ret;
-     AVFrame *frame = c->frame;
  
-     if ((ret = ff_reget_buffer(avctx, frame)) < 0)
 -    if ((ret = ff_reget_buffer(avctx, c->pic)) < 0) {
 -        av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
++    if ((ret = ff_reget_buffer(avctx, c->pic)) < 0)
          return ret;
 -    }
  
      bytestream2_init(gb, buf, buf_size);
  
@@@ -552,11 -543,11 +551,11 @@@ static av_cold int decode_end(AVCodecCo
  {
      VmncContext * const c = avctx->priv_data;
  
-     av_frame_free(&c->frame);
+     av_frame_free(&c->pic);
  
 -    av_free(c->curbits);
 -    av_free(c->curmask);
 -    av_free(c->screendta);
 +    av_freep(&c->curbits);
 +    av_freep(&c->curmask);
 +    av_freep(&c->screendta);
      return 0;
  }