diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index c5e6624a16e3c7d000b1adfaae34b17ba09e74dd..42d23277df3e9dde0eedd98cb2e3b15949596cb4 100644
--- a/ffmpeg_opt.c
+++ b/ffmpeg_opt.c
@@ -674,9 +674,11 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic)
         case AVMEDIA_TYPE_VIDEO:
             if(!ist->dec)
                 ist->dec = avcodec_find_decoder(dec->codec_id);
+#if FF_API_EMU_EDGE
             if (av_codec_get_lowres(dec)) {
                 dec->flags |= CODEC_FLAG_EMU_EDGE;
             }
+#endif
 
             ist->resample_height  = ist->dec_ctx->height;
             ist->resample_width   = ist->dec_ctx->width;
diff --git a/ffplay.c b/ffplay.c
index d0e1822184ab4fce7d52495ca3a7982d77e37f5c..74458fde402a5b7269f95abc2f23839bb2f3a6a3 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -2577,11 +2577,15 @@ static int stream_component_open(VideoState *is, int stream_index)
     }
     av_codec_set_lowres(avctx, stream_lowres);
 
+#if FF_API_EMU_EDGE
     if(stream_lowres) avctx->flags |= CODEC_FLAG_EMU_EDGE;
+#endif
     if (fast)
         avctx->flags2 |= AV_CODEC_FLAG2_FAST;
+#if FF_API_EMU_EDGE
     if(codec->capabilities & AV_CODEC_CAP_DR1)
         avctx->flags |= CODEC_FLAG_EMU_EDGE;
+#endif
 
     opts = filter_codec_opts(codec_opts, avctx->codec_id, ic, ic->streams[stream_index], codec);
     if (!av_dict_get(opts, "threads", NULL, 0))
diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c
index ee0b16ee0b22ab2edd2cae675e85c7e46fc4f56d..f15de58c2c0abbf6539d1ca2c1180cf72cec1b82 100644
--- a/libavcodec/mjpegenc.c
+++ b/libavcodec/mjpegenc.c
@@ -224,9 +224,11 @@ static int amv_encode_picture(AVCodecContext *avctx, AVPacket *pkt,
 
     av_pix_fmt_get_chroma_sub_sample(avctx->pix_fmt, &chroma_h_shift, &chroma_v_shift);
 
+#if FF_API_EMU_EDGE
     //CODEC_FLAG_EMU_EDGE have to be cleared
     if(s->avctx->flags & CODEC_FLAG_EMU_EDGE)
         return AVERROR(EINVAL);
+#endif
 
     if ((avctx->height & 15) && avctx->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL) {
         av_log(avctx, AV_LOG_ERROR,
diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c
index beb25c13c3d58490f119d59bd9db57474a6f397b..9b5a488148750946cd7bdf5d2c8a3a04a6b98fa0 100644
--- a/libavcodec/snowenc.c
+++ b/libavcodec/snowenc.c
@@ -1610,7 +1610,11 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
         s->lambda = 0;
     }//else keep previous frame's qlog until after motion estimation
 
-    if (s->current_picture->data[0] && !(s->avctx->flags&CODEC_FLAG_EMU_EDGE)) {
+    if (s->current_picture->data[0]
+#if FF_API_EMU_EDGE
+        && !(s->avctx->flags&CODEC_FLAG_EMU_EDGE)
+#endif
+        ) {
         int w = s->avctx->width;
         int h = s->avctx->height;
 
diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c
index f8128dc52a8b2db84c1fb6a639b2688d459f932a..cd17358287e617dc88dcb77f4bf182da1b26f119 100644
--- a/libavcodec/wmv2dec.c
+++ b/libavcodec/wmv2dec.c
@@ -453,7 +453,9 @@ 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;