Merge commit 'b3739599bda740ac12d3dde31a331b744df99123'
[ffmpeg.git] / fftools / ffmpeg_opt.c
index d441d29..3a947d8 100644 (file)
@@ -796,9 +796,6 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic)
                 ist->dec_ctx->height = st->codec->height;
                 ist->dec_ctx->coded_width  = st->codec->coded_width;
                 ist->dec_ctx->coded_height = st->codec->coded_height;
-#if FF_API_EMU_EDGE
-                ist->dec_ctx->flags |= CODEC_FLAG_EMU_EDGE;
-#endif
             }
 #endif