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 | |
| 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>
| -rw-r--r-- | libavdevice/v4l2.c | 4 | ||||
| -rw-r--r-- | libavformat/mux.c | 10 |
2 files changed, 7 insertions, 7 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; diff --git a/libavformat/mux.c b/libavformat/mux.c index f21b4dd071..76db60752f 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -284,7 +284,7 @@ FF_ENABLE_DEPRECATION_WARNINGS st = s->streams[i]; par = st->codecpar; -#if FF_API_LAVF_CODEC_TB +#if FF_API_LAVF_CODEC_TB && FF_API_LAVF_AVCTX FF_DISABLE_DEPRECATION_WARNINGS if (!st->time_base.num && st->codec->time_base.num) { av_log(s, AV_LOG_WARNING, "Using AVStream.codec.time_base as a " @@ -530,7 +530,7 @@ fail: #define UNCODED_FRAME_PACKET_SIZE (INT_MIN / 3 * 2 + (int)sizeof(AVFrame)) -#if FF_API_COMPUTE_PKT_FIELDS2 +#if FF_API_COMPUTE_PKT_FIELDS2 && FF_API_LAVF_AVCTX FF_DISABLE_DEPRECATION_WARNINGS //FIXME merge with compute_pkt_fields static int compute_muxer_pkt_fields(AVFormatContext *s, AVStream *st, AVPacket *pkt) @@ -769,7 +769,7 @@ static int prepare_input_packet(AVFormatContext *s, AVPacket *pkt) if (ret < 0) return ret; -#if !FF_API_COMPUTE_PKT_FIELDS2 +#if !FF_API_COMPUTE_PKT_FIELDS2 && FF_API_LAVF_AVCTX /* sanitize the timestamps */ if (!(s->oformat->flags & AVFMT_NOTIMESTAMPS)) { AVStream *st = s->streams[pkt->stream_index]; @@ -838,7 +838,7 @@ int av_write_frame(AVFormatContext *s, AVPacket *pkt) return 1; } -#if FF_API_COMPUTE_PKT_FIELDS2 +#if FF_API_COMPUTE_PKT_FIELDS2 && FF_API_LAVF_AVCTX ret = compute_muxer_pkt_fields(s, s->streams[pkt->stream_index], pkt); if (ret < 0 && !(s->oformat->flags & AVFMT_NOTIMESTAMPS)) @@ -1092,7 +1092,7 @@ int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt) av_log(s, AV_LOG_TRACE, "av_interleaved_write_frame size:%d dts:%s pts:%s\n", pkt->size, av_ts2str(pkt->dts), av_ts2str(pkt->pts)); -#if FF_API_COMPUTE_PKT_FIELDS2 +#if FF_API_COMPUTE_PKT_FIELDS2 && FF_API_LAVF_AVCTX if ((ret = compute_muxer_pkt_fields(s, st, pkt)) < 0 && !(s->oformat->flags & AVFMT_NOTIMESTAMPS)) goto fail; #endif |