diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-21 01:12:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-21 01:17:15 +0200 |
| commit | 495eee01238b1282c6b61a021ee9fa5f42b6f108 (patch) | |
| tree | 965dc2f6cc35ea87f9eb2df863750c92ed43f1ac /libavdevice | |
| parent | 809780ca425afbb1892cbd6957ca2f1cd7d64396 (diff) | |
| parent | 40cf1bbacc6220a0aa6bed5c331871d43f9ce370 (diff) | |
| download | ffmpeg-streaming-495eee01238b1282c6b61a021ee9fa5f42b6f108.zip ffmpeg-streaming-495eee01238b1282c6b61a021ee9fa5f42b6f108.tar.gz | |
Merge commit '40cf1bbacc6220a0aa6bed5c331871d43f9ce370'
* commit '40cf1bbacc6220a0aa6bed5c331871d43f9ce370':
Deprecate avctx.coded_frame
Conflicts:
ffmpeg.c
libavcodec/a64multienc.c
libavcodec/asvenc.c
libavcodec/cljrenc.c
libavcodec/dpxenc.c
libavcodec/gif.c
libavcodec/mpegvideo_enc.c
libavcodec/nvenc.c
libavcodec/proresenc_kostya.c
libavcodec/pthread_frame.c
libavcodec/rawenc.c
libavcodec/sunrastenc.c
libavcodec/tiffenc.c
libavcodec/version.h
libavcodec/xbmenc.c
libavcodec/xwdenc.c
libavdevice/v4l2.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavdevice')
| -rw-r--r-- | libavdevice/v4l2.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index 64ac09c..cc2be37 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -987,7 +987,11 @@ fail: static int v4l2_read_packet(AVFormatContext *ctx, AVPacket *pkt) { struct video_data *s = ctx->priv_data; +#if FF_API_CODED_FRAME +FF_DISABLE_DEPRECATION_WARNINGS AVFrame *frame = ctx->streams[0]->codec->coded_frame; +FF_ENABLE_DEPRECATION_WARNINGS +#endif int res; av_init_packet(pkt); @@ -995,10 +999,14 @@ static int v4l2_read_packet(AVFormatContext *ctx, AVPacket *pkt) return res; } +#if FF_API_CODED_FRAME +FF_DISABLE_DEPRECATION_WARNINGS if (frame && s->interlaced) { frame->interlaced_frame = 1; frame->top_field_first = s->top_field_first; } +FF_ENABLE_DEPRECATION_WARNINGS +#endif return pkt->size; } |
