ffmpeg | branch: master | Anton Khirnov <an...@khirnov.net> | Tue Jul 12 10:42:49 2022 +0200| [adb927fa7aa9d9b9357f09117ca5a449be1fe3d7] | committer: Anton Khirnov
lavc/encode: combine setting no-delay pts for video/audio > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=adb927fa7aa9d9b9357f09117ca5a449be1fe3d7 --- libavcodec/encode.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/encode.c b/libavcodec/encode.c index 72b92d2548..fbe2c97cd6 100644 --- a/libavcodec/encode.c +++ b/libavcodec/encode.c @@ -209,13 +209,13 @@ int ff_encode_encode_cb(AVCodecContext *avctx, AVPacket *avpkt, av_assert0(avpkt->buf); } - if (avctx->codec->type == AVMEDIA_TYPE_VIDEO && - !(avctx->codec->capabilities & AV_CODEC_CAP_DELAY)) - avpkt->pts = frame->pts; + // set the timestamps for the simple no-delay case + // encoders with delay have to set the timestamps themselves if (!(avctx->codec->capabilities & AV_CODEC_CAP_DELAY)) { + if (avpkt->pts == AV_NOPTS_VALUE) + avpkt->pts = frame->pts; + if (avctx->codec->type == AVMEDIA_TYPE_AUDIO) { - if (avpkt->pts == AV_NOPTS_VALUE) - avpkt->pts = frame->pts; if (!avpkt->duration) avpkt->duration = ff_samples_to_time_base(avctx, frame->nb_samples); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
