Merge commit 'd6390090c4dbd766b77353553d9cb4fb4fb41ebd'

[ffmpeg] / fftools / ffmpeg_opt.c

diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c
index d441d29390b2f85d37af25a91b8bae8a023d4743..3a947d8686e22b6bc12a02da0285200b3c85c6c6 100644 (file)
--- a/fftools/ffmpeg_opt.c
+++ b/fftools/ffmpeg_opt.c
@@ -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