From: Anton Khirnov <anton@khirnov.net>
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH 4/9] lavf: use AVFrame.duration instead of AVFrame.pkt_duration
Date: Wed, 13 Jul 2022 11:17:20 +0200
Message-ID: <20220713091725.16638-4-anton@khirnov.net> (raw)
In-Reply-To: <20220713091725.16638-1-anton@khirnov.net>
---
libavformat/mux.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/libavformat/mux.c b/libavformat/mux.c
index 31361f9b46..a3b50dadb6 100644
--- a/libavformat/mux.c
+++ b/libavformat/mux.c
@@ -1417,7 +1417,14 @@ static int write_uncoded_frame_internal(AVFormatContext *s, int stream_index,
pkt->size = sizeof(frame);
pkt->pts =
pkt->dts = frame->pts;
- 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;
pkt->stream_index = stream_index;
pkt->flags |= AV_PKT_FLAG_UNCODED_FRAME;
}
--
2.34.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
next prev parent reply other threads:[~2022-07-13 9:17 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-13 9:17 [FFmpeg-devel] [PATCH 1/9] lavu/frame: add a duration field to AVFrame Anton Khirnov
2022-07-13 9:17 ` [FFmpeg-devel] [PATCH 2/9] lavc: use AVFrame.duration instead of AVFrame.pkt_duration Anton Khirnov
2022-07-13 9:17 ` [FFmpeg-devel] [PATCH 3/9] lavfi: " Anton Khirnov
2022-07-13 15:02 ` Nicolas George
2022-07-14 8:46 ` Anton Khirnov
2022-07-13 9:17 ` Anton Khirnov [this message]
2022-07-13 9:17 ` [FFmpeg-devel] [PATCH 5/9] lavd: " Anton Khirnov
2022-07-13 9:17 ` [FFmpeg-devel] [PATCH 6/9] ffprobe: " Anton Khirnov
2022-07-13 12:39 ` James Almer
2022-07-14 9:34 ` Anton Khirnov
2022-07-14 11:50 ` James Almer
2022-07-18 7:34 ` [FFmpeg-devel] [PATCH] " Anton Khirnov
2022-07-18 8:23 ` Nicolas George
2022-07-18 8:44 ` Anton Khirnov
2022-07-18 11:49 ` James Almer
2022-07-18 11:54 ` Anton Khirnov
2022-07-13 9:17 ` [FFmpeg-devel] [PATCH 7/9] ffmpeg: " Anton Khirnov
2022-07-13 9:17 ` [FFmpeg-devel] [PATCH 8/9] tests/api: " Anton Khirnov
2022-07-13 9:17 ` [FFmpeg-devel] [PATCH 9/9] lavfi/vf_showinfo: print frame durations Anton Khirnov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220713091725.16638-4-anton@khirnov.net \
--to=anton@khirnov.net \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git