Merge commit 'b200a2c8da403b5a5c8b50f8cb4a75fd4f0131b1'

[ffmpeg] / libavcodec / wmv2dec.c

diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c
index 20dbee57032297f3dca9d96eb84748837e819ba3..261d291c97b4749321e7709d17c14a600501d1ed 100644 (file)
--- a/libavcodec/wmv2dec.c
+++ b/libavcodec/wmv2dec.c
@@ -460,10 +460,6 @@ static av_cold int wmv2_decode_init(AVCodecContext *avctx)
     Wmv2Context *const w = avctx->priv_data;
     int ret;
 
-#if FF_API_EMU_EDGE
-    avctx->flags |= CODEC_FLAG_EMU_EDGE;
-#endif
-
     if ((ret = ff_msmpeg4_decode_init(avctx)) < 0)
         return ret;