diff options
| author | Anton Khirnov <anton@khirnov.net> | 2021-04-04 11:48:48 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2021-04-08 11:03:15 +0200 |
| commit | 270ddc2baf8a4533255e770e8e23b2a7cc399026 (patch) | |
| tree | 84e63cc00dbdfc901375b551bfc24482e17fe9a5 | |
| parent | 9168a1c0e67b5c31727b12329b6f52d2bb5e0a14 (diff) | |
| download | ffmpeg-270ddc2baf8a4533255e770e8e23b2a7cc399026.tar.gz | |
lavf: postpone removal of FF_API_COMPUTE_PKT_FIELDS2
The infrastructure to fully handle generating timestamps e.g. for raw
video streamcopy is still not present.
| -rw-r--r-- | libavformat/mux.c | 8 | ||||
| -rw-r--r-- | libavformat/version.h | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/libavformat/mux.c b/libavformat/mux.c index e98b86a81e..d8746f3c13 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -541,7 +541,7 @@ fail: #define AV_PKT_FLAG_UNCODED_FRAME 0x2000 -#if FF_API_COMPUTE_PKT_FIELDS2 && FF_API_LAVF_AVCTX +#if FF_API_COMPUTE_PKT_FIELDS2 FF_DISABLE_DEPRECATION_WARNINGS //FIXME merge with compute_pkt_fields static int compute_muxer_pkt_fields(AVFormatContext *s, AVStream *st, AVPacket *pkt) @@ -621,7 +621,7 @@ static int compute_muxer_pkt_fields(AVFormatContext *s, AVStream *st, AVPacket * case AVMEDIA_TYPE_AUDIO: frame_size = (pkt->flags & AV_PKT_FLAG_UNCODED_FRAME) ? (*(AVFrame **)pkt->data)->nb_samples : - av_get_audio_frame_duration(st->codec, pkt->size); + av_get_audio_frame_duration2(st->codecpar, pkt->size); /* HACK/FIXME, we skip the initial 0 size packets as they are most * likely equal to the encoder delay, but it would be better if we @@ -779,7 +779,7 @@ static int check_packet(AVFormatContext *s, AVPacket *pkt) static int prepare_input_packet(AVFormatContext *s, AVStream *st, AVPacket *pkt) { -#if !FF_API_COMPUTE_PKT_FIELDS2 || !FF_API_LAVF_AVCTX +#if !FF_API_COMPUTE_PKT_FIELDS2 /* sanitize the timestamps */ if (!(s->oformat->flags & AVFMT_NOTIMESTAMPS)) { @@ -1140,7 +1140,7 @@ static int write_packet_common(AVFormatContext *s, AVStream *st, AVPacket *pkt, guess_pkt_duration(s, st, pkt); -#if FF_API_COMPUTE_PKT_FIELDS2 && FF_API_LAVF_AVCTX +#if FF_API_COMPUTE_PKT_FIELDS2 if ((ret = compute_muxer_pkt_fields(s, st, pkt)) < 0 && !(s->oformat->flags & AVFMT_NOTIMESTAMPS)) return ret; #endif diff --git a/libavformat/version.h b/libavformat/version.h index b6023f9d2e..66068d4d56 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -55,9 +55,6 @@ * at once through the bump. This improves the git bisect-ability of the change. * */ -#ifndef FF_API_COMPUTE_PKT_FIELDS2 -#define FF_API_COMPUTE_PKT_FIELDS2 (LIBAVFORMAT_VERSION_MAJOR < 59) -#endif #ifndef FF_API_OLD_OPEN_CALLBACKS #define FF_API_OLD_OPEN_CALLBACKS (LIBAVFORMAT_VERSION_MAJOR < 59) #endif @@ -115,6 +112,9 @@ #ifndef FF_API_LAVF_PRIV_OPT #define FF_API_LAVF_PRIV_OPT (LIBAVFORMAT_VERSION_MAJOR < 60) #endif +#ifndef FF_API_COMPUTE_PKT_FIELDS2 +#define FF_API_COMPUTE_PKT_FIELDS2 (LIBAVFORMAT_VERSION_MAJOR < 60) +#endif #ifndef FF_API_R_FRAME_RATE |