Merge commit 'adb199d1bc7f86aa6b85986f40190ec17f99d34f'

* commit 'adb199d1bc7f86aa6b85986f40190ec17f99d34f':
  kgv1dec: replace forcing EMU_EDGE by a copy

Conflicts:
	libavcodec/kgv1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/kgv1dec.c
index 5528c6f,d58e775..ea1ca9a
--- 1/libavcodec/kgv1dec.c
--- 2/libavcodec/kgv1dec.c
+++ b/libavcodec/kgv1dec.c
@@@ -31,7 -31,9 +31,8 @@@
  #include "internal.h"
  
  typedef struct {
-     AVFrame *prev;
 -    AVCodecContext *avctx;
+     uint16_t *frame_buffer;
+     uint16_t *last_frame_buffer;
  } KgvContext;
  
  static void decode_flush(AVCodecContext *avctx)
@@@ -155,20 -174,15 +164,14 @@@ static av_cold int decode_init(AVCodecC
  {
      KgvContext * const c = avctx->priv_data;
  
-     c->prev = av_frame_alloc();
-     if (!c->prev)
-         return AVERROR(ENOMEM);
- 
 -    c->avctx = avctx;
      avctx->pix_fmt = AV_PIX_FMT_RGB555;
-     avctx->flags  |= CODEC_FLAG_EMU_EDGE;
  
      return 0;
  }
  
  static av_cold int decode_end(AVCodecContext *avctx)
  {
 -    decode_flush(avctx);
 +    KgvContext * const c = avctx->priv_data;
-     av_frame_free(&c->prev);
      return 0;
  }