diff mbox series

[FFmpeg-devel] avformat/mux: use av_get_audio_frame_duration2()

Message ID 20210324040356.55602-1-jamrial@gmail.com
State New
Headers show
Series [FFmpeg-devel] avformat/mux: use av_get_audio_frame_duration2() | expand

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished
andriy/PPC64_make success Make finished
andriy/PPC64_make_fate success Make fate finished

Commit Message

James Almer March 24, 2021, 4:03 a.m. UTC 
This removes the only use of st->codec in compute_muxer_pkt_fields()

Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavformat/mux.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/libavformat/mux.c b/libavformat/mux.c
index e98b86a81e..5d907cfaee 100644
--- a/libavformat/mux.c
+++ b/libavformat/mux.c
@@ -541,8 +541,7 @@  fail:
 #define AV_PKT_FLAG_UNCODED_FRAME 0x2000
 
 
-#if FF_API_COMPUTE_PKT_FIELDS2 && FF_API_LAVF_AVCTX
-FF_DISABLE_DEPRECATION_WARNINGS
+#if FF_API_COMPUTE_PKT_FIELDS2
 //FIXME merge with compute_pkt_fields
 static int compute_muxer_pkt_fields(AVFormatContext *s, AVStream *st, AVPacket *pkt)
 {
@@ -621,7 +620,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
@@ -636,7 +635,6 @@  static int compute_muxer_pkt_fields(AVFormatContext *s, AVStream *st, AVPacket *
     }
     return 0;
 }
-FF_ENABLE_DEPRECATION_WARNINGS
 #endif
 
 static void guess_pkt_duration(AVFormatContext *s, AVStream *st, AVPacket *pkt)
@@ -779,7 +777,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 +1138,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