diff options
| author | Diego Biurrun <diego@biurrun.de> | 2016-05-04 00:32:26 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2016-05-13 15:14:30 +0200 |
| commit | 11de006babf735aafa3462d43dd2c02bb6ac6e2f (patch) | |
| tree | 8391bb4100f6f44b8c31954e4d0139c05e98271f /libavdevice/v4l2.c | |
| parent | a6a750c7ef240b72ce01e9653343a0ddf247d196 (diff) | |
| download | ffmpeg-11de006babf735aafa3462d43dd2c02bb6ac6e2f.tar.gz | |
Combine deprecation guards where appropriate
Some code blocks use multiple bits of deprecated API.
Diffstat (limited to 'libavdevice/v4l2.c')
| -rw-r--r-- | libavdevice/v4l2.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; |