diff options
| author | Anton Khirnov <anton@khirnov.net> | 2022-07-11 10:31:47 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2022-07-19 12:27:17 +0200 |
| commit | 2d90fc89f2a804a096ff092797c14432b63c8120 (patch) | |
| tree | f3b90007619f98afc6a4348020dbfd9648181845 /libavdevice | |
| parent | 7d9ee6741c53a2ea9f3a5559c32320b731a8d80a (diff) | |
| download | ffmpeg-2d90fc89f2a804a096ff092797c14432b63c8120.tar.gz | |
lavd: use AVFrame.duration instead of AVFrame.pkt_duration
Diffstat (limited to 'libavdevice')
| -rw-r--r-- | libavdevice/alsa_enc.c | 9 | ||||
| -rw-r--r-- | libavdevice/pulse_audio_enc.c | 9 |
2 files changed, 16 insertions, 2 deletions
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); } |