From e0ab5078a7d865f8f6fd6a6d3cbe0f380ead4a3d Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Mon, 20 Jan 2014 15:22:09 +0100
Subject: lavc: do not force the emu edge flag

The default get_buffer2() implementation (and possibly some
user ones) does not allocate edges when this flag is set, which may
expose bugs in some decoders. Until the 10 release is out, it is safer
to remove this part.
---
 libavcodec/utils.c | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'libavcodec')

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 2e418ec46c..044413a50a 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1091,11 +1091,6 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code
             ret = AVERROR(EINVAL);
             goto free_and_end;
         }
-
-#if FF_API_EMU_EDGE
-        /* force the emu edge flag on, since it's now always active */
-        avctx->flags |= CODEC_FLAG_EMU_EDGE;
-#endif
     }
 end:
     entangled_thread_counter--;
-- 
cgit v1.2.3