diff options
| author | Clément Bœsch <clement@stupeflix.com> | 2016-06-22 17:36:42 +0200 |
|---|---|---|
| committer | Clément Bœsch <clement@stupeflix.com> | 2016-06-22 17:36:42 +0200 |
| commit | a444a50510e76a87f34d5b2e6d4f696b6af7e79b (patch) | |
| tree | c7f6a68b760ea959a41dce61d0f94dbb06f795a3 /libavdevice | |
| parent | 48ac4532d437790e56b8ed5d0d467dc88685f035 (diff) | |
| parent | 11de006babf735aafa3462d43dd2c02bb6ac6e2f (diff) | |
| download | ffmpeg-a444a50510e76a87f34d5b2e6d4f696b6af7e79b.tar.gz | |
Merge commit '11de006babf735aafa3462d43dd2c02bb6ac6e2f'
* commit '11de006babf735aafa3462d43dd2c02bb6ac6e2f':
Combine deprecation guards where appropriate
Merged-by: Clément Bœsch <clement@stupeflix.com>
Diffstat (limited to 'libavdevice')
| -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 9153ad4302..ddf331d43d 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -971,7 +971,7 @@ fail: static int v4l2_read_packet(AVFormatContext *ctx, AVPacket *pkt) { -#if FF_API_CODED_FRAME +#if FF_API_CODED_FRAME && FF_API_LAVF_AVCTX FF_DISABLE_DEPRECATION_WARNINGS struct video_data *s = ctx->priv_data; AVFrame *frame = ctx->streams[0]->codec->coded_frame; @@ -984,7 +984,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; |