From patchwork Mon Sep 26 17:13:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Toohill X-Patchwork-Id: 728 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp2026096vsd; Mon, 26 Sep 2016 10:14:15 -0700 (PDT) X-Received: by 10.194.106.234 with SMTP id gx10mr23028010wjb.202.1474910055883; Mon, 26 Sep 2016 10:14:15 -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 w2si9383192wmw.0.2016.09.26.10.14.15; Mon, 26 Sep 2016 10:14:15 -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 07ACD689E93; Mon, 26 Sep 2016 20:13:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f173.google.com (mail-pf0-f173.google.com [209.85.192.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3425D689E6D for ; Mon, 26 Sep 2016 20:13:39 +0300 (EEST) Received: by mail-pf0-f173.google.com with SMTP id l25so19639565pfb.1 for ; Mon, 26 Sep 2016 10:13:56 -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=P1pPW5v3GM7T2piJI+KMfASWCQ2TABpizTXiv/Yf+5c=; b=S35VuABNq6sJFiBDd+p0w/lJcXVWzBO9b3UVD2LHSSYsRPs0VsB/wVHrJz7iwuaiVF VrE23eNo9y3l7HCi5XxuBSRBwa6TwLuoEWaDl+jt5vmMc+g+n3uUNMR5nEUb23UkF2/5 AnqnjZb5Ys4WF+DvRp4QAbWa1vKarzO4eWXScjsDbfGFOo/MfANugBU3T/DsrGnwZYQH l447A6jjYTuGdvh9QLDttoO2G65lwxQaakB4zQ+vTOuuaP184yhtJtYQw4i8YctWdsLi IGnKQGzdUEYX7U6HJPi/SUC0LUQvh6yg4jGRng2D4HknhNdscLpPZfXFSNE3UEbqLYzD 0mbw== 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=P1pPW5v3GM7T2piJI+KMfASWCQ2TABpizTXiv/Yf+5c=; b=Sal+Z3HTmBE2j0YpTbDjgOt35veCZjUnUeaEk1Hq/X6bqWt2cHlPSPhhUGdYgVrLOL gqPFmnTs15Irp91DhK4ED/M+a1Aknx0MU1gy+qPDFiuyTxZFW/u+X9L+O9V7gpra2Zxo 6eQbb+d7Gg01/1osndUc/DcYC/r62ZVcQUeOFVxj1JwMAt301wSzyJpnlk9tlv0v+GrQ 0lxKRD3k2817A7+yxvMOMJ1m7pDpHgnFw4HS78/WOtOHw4xMlRewoxGahLK/vCiL0VFs N6lFd4IquiKNuE0PPkiwkp5zHdaV2WF0yMfsf7vkChjkUtIikuXNpBPs7oxjhkDQHIZ6 3m0w== X-Gm-Message-State: AE9vXwOTOCgiYwHwJG5/Py8tZ//oM984J8vjI3jkAIx1KxvCxo4U11IdNyK/tbCeqfkg0bd9 X-Received: by 10.98.159.194 with SMTP id v63mr39697521pfk.91.1474910035105; Mon, 26 Sep 2016 10:13:55 -0700 (PDT) Received: from mungolini.mtv.corp.google.com ([100.96.2.73]) by smtp.gmail.com with ESMTPSA id c66sm32499223pfd.24.2016.09.26.10.13.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 26 Sep 2016 10:13:54 -0700 (PDT) From: Jon Toohill To: ffmpeg-devel@ffmpeg.org Date: Mon, 26 Sep 2016 10:13:37 -0700 Message-Id: <1474910019-13882-3-git-send-email-jtoohill@google.com> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1474910019-13882-1-git-send-email-jtoohill@google.com> References: <1474910019-13882-1-git-send-email-jtoohill@google.com> Subject: [FFmpeg-devel] [PATCH 2/4] lavc/libmp3lame: set trailing_padding after flushing encoder 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" --- libavcodec/libmp3lame.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/libmp3lame.c b/libavcodec/libmp3lame.c index 5642264..1566921 100644 --- a/libavcodec/libmp3lame.c +++ b/libavcodec/libmp3lame.c @@ -218,6 +218,7 @@ static int mp3lame_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, } else { lame_result = lame_encode_flush(s->gfp, s->buffer + s->buffer_index, s->buffer_size - s->buffer_index); + avctx->trailing_padding = FFMAX(lame_get_encoder_padding(s->gfp) - 528 - 1, 0); } if (lame_result < 0) { if (lame_result == -1) {