From 8ffd2f1dd429cd1ca0e7e0ef48aa15584a599264 Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 25 Apr 2016 19:11:16 +0200 Subject: vd_lavc: simplify some unneeded ifdeffery These were for ancient libavcodec versions. --- video/decode/vd_lavc.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'video/decode/vd_lavc.c') diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c index 7658842711..b5679f1b46 100644 --- a/video/decode/vd_lavc.c +++ b/video/decode/vd_lavc.c @@ -478,14 +478,8 @@ static void init_avctx(struct dec_video *vd, const char *decoder, avctx->flags |= lavc_param->bitexact ? CODEC_FLAG_BITEXACT : 0; avctx->flags2 |= lavc_param->fast ? CODEC_FLAG2_FAST : 0; - if (lavc_param->show_all) { -#ifdef CODEC_FLAG2_SHOW_ALL - avctx->flags2 |= CODEC_FLAG2_SHOW_ALL; // ffmpeg only? -#endif -#ifdef CODEC_FLAG_OUTPUT_CORRUPT - avctx->flags |= CODEC_FLAG_OUTPUT_CORRUPT; // added with Libav 10 -#endif - } + if (lavc_param->show_all) + avctx->flags |= CODEC_FLAG_OUTPUT_CORRUPT; avctx->skip_loop_filter = lavc_param->skip_loop_filter; avctx->skip_idct = lavc_param->skip_idct; -- cgit v1.2.3