summaryrefslogtreecommitdiff
path: root/ffmpeg_opt.c
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-08-30 22:31:35 -0300
committerJames Almer <jamrial@gmail.com>2017-08-30 22:45:00 -0300
commit6e131a7cd970a39bcc8cbfdd32d10a90e3ab51c5 (patch)
tree4f4598bc9ebcc5ba767d684eee22f7a331122860 /ffmpeg_opt.c
parent2fcf47e2d175397c44e0d4b9063dc1ad78614d78 (diff)
ffmpeg_opt: add proper deprecation guards to lowres code
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'ffmpeg_opt.c')
-rw-r--r--ffmpeg_opt.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index f275f711be..100fa76e46 100644
--- a/ffmpeg_opt.c
+++ b/ffmpeg_opt.c
@@ -791,14 +791,16 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic)
case AVMEDIA_TYPE_VIDEO:
if(!ist->dec)
ist->dec = avcodec_find_decoder(par->codec_id);
-#if FF_API_EMU_EDGE
+#if FF_API_LOWRES
if (av_codec_get_lowres(st->codec)) {
av_codec_set_lowres(ist->dec_ctx, av_codec_get_lowres(st->codec));
ist->dec_ctx->width = st->codec->width;
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