opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-05-17 15:08:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '11de006babf735aafa3462d43dd2c02bb6ac6e2f'

Browse Source 
* commit '11de006babf735aafa3462d43dd2c02bb6ac6e2f':
  Combine deprecation guards where appropriate

Merged-by: Clément Bœsch <clement@stupeflix.com>
This commit is contained in:
Clément Bœsch
2016-06-22 17:36:42 +02:00
parent 48ac4532d4 11de006bab
commit a444a50510
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavdevice/v4l2.c
View File

@ -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;