Merge commit 'e0ab5078a7d865f8f6fd6a6d3cbe0f380ead4a3d'

* commit 'e0ab5078a7d865f8f6fd6a6d3cbe0f380ead4a3d':
  lavc: do not force the emu edge flag

Conflicts:
	libavcodec/utils.c

There should be no such bugs in ffmpeg, but merging it anyway
as its safer.

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

libavcodec/utils.c

@@ -1493,11 +1493,6 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code
                 }
             }
         }
-
-#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:
     ff_unlock_avcodec();