From 11de006babf735aafa3462d43dd2c02bb6ac6e2f Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Wed, 4 May 2016 00:32:26 +0200 Subject: Combine deprecation guards where appropriate Some code blocks use multiple bits of deprecated API. --- libavdevice/v4l2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavdevice') diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index b59f29f554..74fec51203 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -853,7 +853,7 @@ static int v4l2_read_header(AVFormatContext *s1) static int v4l2_read_packet(AVFormatContext *s1, AVPacket *pkt) { -#if FF_API_CODED_FRAME +#if FF_API_CODED_FRAME && FF_API_LAVF_AVCTX FF_DISABLE_DEPRECATION_WARNINGS struct video_data *s = s1->priv_data; AVFrame *frame = s1->streams[0]->codec->coded_frame; @@ -866,7 +866,7 @@ FF_ENABLE_DEPRECATION_WARNINGS return res; } -#if FF_API_CODED_FRAME +#if FF_API_CODED_FRAME && FF_API_LAVF_AVCTX FF_DISABLE_DEPRECATION_WARNINGS if (frame && s->interlaced) { frame->interlaced_frame = 1; -- cgit v1.2.3