diff mbox series

[FFmpeg-devel,5/9] lavd: use AVFrame.duration instead of AVFrame.pkt_duration

Message ID 20220713091725.16638-5-anton@khirnov.net
State Accepted
Commit 2d90fc89f2a804a096ff092797c14432b63c8120
Headers show
Series [FFmpeg-devel,1/9] lavu/frame: add a duration field to AVFrame | expand

Checks

Context Check Description
andriy/configure_x86 warning Failed to apply patch

Commit Message

Anton Khirnov July 13, 2022, 9:17 a.m. UTC 
---
 libavdevice/alsa_enc.c        | 9 ++++++++-
 libavdevice/pulse_audio_enc.c | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/libavdevice/alsa_enc.c b/libavdevice/alsa_enc.c
index ac09e33c49..e461829d03 100644
--- a/libavdevice/alsa_enc.c
+++ b/libavdevice/alsa_enc.c
@@ -131,7 +131,14 @@  static int audio_write_frame(AVFormatContext *s1, int stream_index,
     pkt.data     = (*frame)->data[0];
     pkt.size     = (*frame)->nb_samples * s->frame_size;
     pkt.dts      = (*frame)->pkt_dts;
-    pkt.duration = (*frame)->pkt_duration;
+#if FF_API_PKT_DURATION
+FF_DISABLE_DEPRECATION_WARNINGS
+    if ((*frame)->pkt_duration)
+        pkt.duration = (*frame)->pkt_duration;
+    else
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
+    pkt.duration = (*frame)->duration;
     return audio_write_packet(s1, &pkt);
 }
 
diff --git a/libavdevice/pulse_audio_enc.c b/libavdevice/pulse_audio_enc.c
index d5928e2b3f..038401c680 100644
--- a/libavdevice/pulse_audio_enc.c
+++ b/libavdevice/pulse_audio_enc.c
@@ -686,7 +686,14 @@  static int pulse_write_frame(AVFormatContext *h, int stream_index,
     pkt.data     = (*frame)->data[0];
     pkt.size     = (*frame)->nb_samples * av_get_bytes_per_sample((*frame)->format) * (*frame)->ch_layout.nb_channels;
     pkt.dts      = (*frame)->pkt_dts;
-    pkt.duration = (*frame)->pkt_duration;
+#if FF_API_PKT_DURATION
+FF_DISABLE_DEPRECATION_WARNINGS
+    if ((*frame)->pkt_duration)
+        pkt.duration = (*frame)->pkt_duration;
+    else
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
+    pkt.duration = (*frame)->duration;
     return pulse_write_packet(h, &pkt);
 }