From patchwork Tue Aug 13 02:47:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 14469 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 83624449ADB for ; Tue, 13 Aug 2019 05:55:51 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6BCD068A42C; Tue, 13 Aug 2019 05:55:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B2CDC6805C7 for ; Tue, 13 Aug 2019 05:55:45 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id i63so72718wmg.4 for ; Mon, 12 Aug 2019 19:55:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IGK+T91UeVbbpAFxivlJIpTmL0cJcnEePPbWdfJvzI0=; b=qjZ53Io3/o4t77lRJPdWYcHt/uTRbBN/34B04QTFLZKksnPq67d+MAnq7IXgyAmpbF v6cC3d1CYVHing8+5BXtSLAWQ2UpuH+ku3QSofw7UslWm+/eG+6wlTJeThSW8uAZr0g3 1IXCCxrqqo55/Oc9RntQLniPKnUHgaFMVH7g2thJjDG52tHOHMhshN3TxYGo958FgFmu lIf7xFwcGcIhcnHy38n09D5HV4+aWQ06Syef6fGGYlnsfikkmB/v6Ln4rPRcWh+uIauB dr8AlSG1ntFvPbsKnYhv43Jw1xkgKV3WF/h9/Pu0kUbAp5O3JzxqRV4eJioWbRMCkxSn s7CA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IGK+T91UeVbbpAFxivlJIpTmL0cJcnEePPbWdfJvzI0=; b=rX5/teNwHq8Q0hkNkP/RT9Iz14AscRegyIlqeszpY4BLfhNrg6v60ybtk4qyJRmCPx EPRQUSQgHNmPiSOfHIe4b3j9Ha3ShrFVBEAeNvCUMtbX1CjWUM1Np5r71pUDPJEvQbNA td2NAx2jJPfePLuu+ytL3i8BowNctV9hWBrqx9vYhCOoKJDNyoAvT3zOaYO7uunTqrx2 SoidT9R400EHe1aMzDH5odvsXBDP0EfR3HlztmCpWuDIIuquJACdag6aLIWXsQmnZuYy nyZIA/Lg/wLx9kyrbLQJJtKscA6r6YAsoGCTeFyw6GYkzIalmy1ZaoEkF2GVm0Q9Og54 rrFw== X-Gm-Message-State: APjAAAXwZYBccUODt3/zq+hRQj0HIJQ8PLFyPWRQ1INHzUJrhmf14qYW J5D7B+y1AlVOb/Il3ewa3WH93LUz X-Google-Smtp-Source: APXvYqxQ9M+aB+X6UpnSljdJ0h9w2W8fq5pzpg9qu5H5ntkN3wiXqMqHjtwpvTs872jruXIwo14Uaw== X-Received: by 2002:a05:600c:da:: with SMTP id u26mr174862wmm.70.1565664527607; Mon, 12 Aug 2019 19:48:47 -0700 (PDT) Received: from localhost.localdomain (ipbcc06ceb.dynamic.kabel-deutschland.de. [188.192.108.235]) by smtp.gmail.com with ESMTPSA id k13sm25020613wro.97.2019.08.12.19.48.46 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 12 Aug 2019 19:48:47 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 13 Aug 2019 04:47:19 +0200 Message-Id: <20190813024726.6596-6-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190813024726.6596-1-andreas.rheinhardt@gmail.com> References: <20190813024726.6596-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 06/13] avformat/mux: Use av_packet_rescale_ts X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" ff_write_chained essentially duplicated the functionality of av_packet_rescale_ts. This has been changed. Signed-off-by: Andreas Rheinhardt --- libavformat/mux.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/libavformat/mux.c b/libavformat/mux.c index 44ce099cbf..efe2e94f40 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -1317,18 +1317,10 @@ int ff_write_chained(AVFormatContext *dst, int dst_stream, AVPacket *pkt, local_pkt = *pkt; local_pkt.stream_index = dst_stream; - if (pkt->pts != AV_NOPTS_VALUE) - local_pkt.pts = av_rescale_q(pkt->pts, - src->streams[pkt->stream_index]->time_base, - dst->streams[dst_stream]->time_base); - if (pkt->dts != AV_NOPTS_VALUE) - local_pkt.dts = av_rescale_q(pkt->dts, - src->streams[pkt->stream_index]->time_base, - dst->streams[dst_stream]->time_base); - if (pkt->duration) - local_pkt.duration = av_rescale_q(pkt->duration, - src->streams[pkt->stream_index]->time_base, - dst->streams[dst_stream]->time_base); + + av_packet_rescale_ts(&local_pkt, + src->streams[pkt->stream_index]->time_base, + dst->streams[dst_stream]->time_base); if (interleave) ret = av_interleaved_write_frame(dst, &local_pkt); else ret = av_write_frame(dst, &local_pkt);