From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Sat, 24 Mar 2018 17:02:59 +0000 (+0100)
Subject: Simplify the timebase conversion in mux.cpp.
X-Git-Tag: 1.7.1~1
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=bcaf94e7f9a10925a86b8f7e03e5e184550ae9f5;p=nageru

Simplify the timebase conversion in mux.cpp.
---

diff --git a/mux.cpp b/mux.cpp
index 5e9043e..e554ec5 100644
--- a/mux.cpp
+++ b/mux.cpp
@@ -154,13 +154,9 @@ void Mux::add_packet(const AVPacket &pkt, int64_t pts, int64_t dts, AVRational t
 		exit(1);
 	}
 	if (pkt.stream_index == 0) {
-		pkt_copy.pts = av_rescale_q(pts, timebase, avstream_video->time_base);
-		pkt_copy.dts = av_rescale_q(dts, timebase, avstream_video->time_base);
-		pkt_copy.duration = av_rescale_q(pkt.duration, timebase, avstream_video->time_base);
+		av_packet_rescale_ts(&pkt_copy, timebase, avstream_video->time_base);
 	} else if (pkt.stream_index == 1) {
-		pkt_copy.pts = av_rescale_q(pts, timebase, avstream_audio->time_base);
-		pkt_copy.dts = av_rescale_q(dts, timebase, avstream_audio->time_base);
-		pkt_copy.duration = av_rescale_q(pkt.duration, timebase, avstream_audio->time_base);
+		av_packet_rescale_ts(&pkt_copy, timebase, avstream_audio->time_base);
 	} else {
 		assert(false);
 	}