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 | |
| parent | a6a750c7ef240b72ce01e9653343a0ddf247d196 (diff) | |
| download | ffmpeg-11de006babf735aafa3462d43dd2c02bb6ac6e2f.tar.gz | |
Combine deprecation guards where appropriate
Some code blocks use multiple bits of deprecated API.
| -rw-r--r-- | libavdevice/v4l2.c | 4 | ||||
| -rw-r--r-- | libavformat/mux.c | 12 |
2 files changed, 8 insertions, 8 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; diff --git a/libavformat/mux.c b/libavformat/mux.c index 5f0d7ddd4b..0761a93b6d 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -99,7 +99,7 @@ static int init_muxer(AVFormatContext *s, AVDictionary **options) if ((ret = av_opt_set_dict(s, &tmp)) < 0) goto fail; -#if FF_API_LAVF_BITEXACT +#if FF_API_LAVF_BITEXACT && FF_API_LAVF_AVCTX FF_DISABLE_DEPRECATION_WARNINGS if (s->nb_streams && s->streams[0]->codec->flags & AV_CODEC_FLAG_BITEXACT) s->flags |= AVFMT_FLAG_BITEXACT; @@ -117,7 +117,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 " @@ -272,7 +272,7 @@ int avformat_write_header(AVFormatContext *s, AVDictionary **options) return 0; } -#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_pkt_fields2(AVFormatContext *s, AVStream *st, AVPacket *pkt) @@ -417,7 +417,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]; @@ -475,7 +475,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_pkt_fields2(s, s->streams[pkt->stream_index], pkt); if (ret < 0 && !(s->oformat->flags & AVFMT_NOTIMESTAMPS)) @@ -639,7 +639,7 @@ int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt) goto fail; if (pkt) { -#if FF_API_COMPUTE_PKT_FIELDS2 +#if FF_API_COMPUTE_PKT_FIELDS2 && FF_API_LAVF_AVCTX AVStream *st = s->streams[pkt->stream_index]; av_log(s, AV_LOG_TRACE, "av_interleaved_write_frame size:%d dts:%" PRId64 " pts:%" PRId64 "\n", |