From patchwork Wed Sep 28 18:28:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Toohill X-Patchwork-Id: 766 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp563080vsd; Wed, 28 Sep 2016 11:29:46 -0700 (PDT) X-Received: by 10.28.189.197 with SMTP id n188mr8887879wmf.116.1475087385940; Wed, 28 Sep 2016 11:29:45 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id en8si9921510wjb.287.2016.09.28.11.29.37; Wed, 28 Sep 2016 11:29:45 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 09AFB689977; Wed, 28 Sep 2016 21:29:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f180.google.com (mail-pf0-f180.google.com [209.85.192.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 62396680A7B for ; Wed, 28 Sep 2016 21:29:10 +0300 (EEST) Received: by mail-pf0-f180.google.com with SMTP id q2so19945198pfj.3 for ; Wed, 28 Sep 2016 11:29:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=4aJlHbyw8zNipWpThb6UJdCD6K5Z6kXwSKLSuqiE+FI=; b=WEg41w/onEftq5MGOmA/Q7UtAB23O7iyzqHwiw+ojQnLQb+9ywDpNEQO/sWHyP5lqG zI5N58Sqh8PARIrPsa+8183AM78w3yGiD23EQlbMKskEmVHJHCExx1IPKt12xbKz9o04 Ih1PwY3mwUvG1K0av62vEWLjZdZZH8tIJ9MMPiMVsilAaQvoRPMyezr4T4EbLddi6WcS 1PovEjrcuv1BiU1o19LjHn3x+Z4U8MVe7ExHP2NNm2fa7y3JeA0qIbWhESp6KwG64hkx 3pDmZfv0TEM1VKqBE1QnOCaq3+oU/6uJ8Rr6fWRD7vrn5WYLweWgfa79hShdyFy4Gg7o raDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=4aJlHbyw8zNipWpThb6UJdCD6K5Z6kXwSKLSuqiE+FI=; b=WCfBvvRgpckCq63EvtwQpD/78HxTTZmnecErgBO+Wj5GVjLKLwPboWm6FhjPuFOsp0 xuqXublPJWS8jPeb8yVGD3eO5D+j+ToxdsdzlQbNtC5/xcbIVdD+DI14OqVs9i+sOPmn dJ8HuN3FtBJHB32u/KSUbNTV73vC1vjZTj3eB/ik20ZLP108kHRMzUMuFXgplcoxRG7h 3X5Z/lFPcwNbhGn6l9hiXaLAwUo440OYXmOcv8P3xoO0NMty8vquJkQU4JoW4Jib8KTt 9q8htmhaUMTWGeYoEGkA652Z55fevjs3b9Y6kFJO92TOIFgh28ZJqaDejvaC/kammgU6 WYLQ== X-Gm-Message-State: AE9vXwPhFsaYsPo0R2phribdysfry6d7xeGzOzNuSQDPV6gll33LvcP1ovNG0DbwT3727vJh X-Received: by 10.98.89.199 with SMTP id k68mr59967440pfj.72.1475087360931; Wed, 28 Sep 2016 11:29:20 -0700 (PDT) Received: from mungolini.mtv.corp.google.com ([100.96.2.73]) by smtp.gmail.com with ESMTPSA id wa9sm14248493pac.35.2016.09.28.11.29.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 28 Sep 2016 11:29:20 -0700 (PDT) From: Jon Toohill To: ffmpeg-devel@ffmpeg.org Date: Wed, 28 Sep 2016 11:28:59 -0700 Message-Id: <1475087343-29745-2-git-send-email-jtoohill@google.com> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1475087343-29745-1-git-send-email-jtoohill@google.com> References: <1475087343-29745-1-git-send-email-jtoohill@google.com> Subject: [FFmpeg-devel] [PATCH 1/4] ffmpeg: re-copy codec contexts after encoding 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: Jon Toohill MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This preserves changes to fields of AVCodecContext that get updated during encoding, such as trailing_padding (which may not be known until encoding is complete). --- ffmpeg.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/ffmpeg.c b/ffmpeg.c index df55a49..1e973f5 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -4243,6 +4243,21 @@ static int transcode(void) term_exit(); + /* update output codec contexts after encoding */ + for (i = 0; i < nb_output_streams; i++) { + ost = output_streams[i]; + if (ost->encoding_needed) { + ret = avcodec_copy_context( + output_files[ost->file_index]->ctx->streams[ost->index]->codec, + ost->enc_ctx); + if (ret < 0) { + av_log(ost, AV_LOG_ERROR, "Error copying final codec context: %s\n", av_err2str(ret)); + if (exit_on_error) + exit_program(1); + } + } + } + /* write the trailer if needed and close file */ for (i = 0; i < nb_output_files; i++) { os = output_files[i]->ctx;