From patchwork Tue Nov 1 02:32:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 1246 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp447894vsb; Mon, 31 Oct 2016 19:34:47 -0700 (PDT) X-Received: by 10.28.97.139 with SMTP id v133mr9164010wmb.117.1477967687846; Mon, 31 Oct 2016 19:34:47 -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 p127si28169204wmd.146.2016.10.31.19.34.47; Mon, 31 Oct 2016 19:34:47 -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=@gmail.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; dmarc=fail (p=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 26828689C19; Tue, 1 Nov 2016 04:34:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ua0-f196.google.com (mail-ua0-f196.google.com [209.85.217.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 87BB0689218 for ; Tue, 1 Nov 2016 04:34:35 +0200 (EET) Received: by mail-ua0-f196.google.com with SMTP id 12so5990921uas.3 for ; Mon, 31 Oct 2016 19:34:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=of2Z7ZbP+iDsa7SkF2eVM2A9DdGn8cFapqSJJpWw3is=; b=xtMMOPNdWl7nvZC+GnuIERI5VN2RQW7P52/ODvlOtur7PAr8cGYKpwAdZtTrrVApsh GUbq4MlhS8mR8abAuLaoAz2VSq4Iw5JWvjoS71kRN4GgPVUGWggfpnv/cQsG0LlAMZ3I zca4SPQsySuvOn8fj+xJLBpp/8SdJDjCwBH1OZ+p2uAh7Md9Rbq2KRY6znBM0tk1G87Q IY2QzTOByfZDr4PZl4x7KzbwMYN51CRSdMqG38eIL28o2ALMJS4cVjZdOvei8/iLyx1+ mEXin8i4v7HPL1LvBRCLOy64FTfsrlrbiCjLd2ARqts4JNdi2hloWq6HuH1duWNsgsDP Pq8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=of2Z7ZbP+iDsa7SkF2eVM2A9DdGn8cFapqSJJpWw3is=; b=Grpuz9pAajCEx9Qq0JpFvDC5NqrSTvzRSltIu2xoILVP15GWh5sD2NXnne6mgdHEtD QgLFXZBERwO5nocEpqXSM71m1WgRQyLxqLUUaY63/ACHwoCRwkh5N3PLEt1MvzRKfk6o AOrmYAQYVbXXA+Y0P5kMuQ2/PKAtLZqOV9s9x/2vslrzFA6Hc5MtEuVja64LxrBmBXHV iiHsV+mCa56v2vNNsQpwItkqzoSuPjJKSNxqK1jex/tZmZxZ4JtQ2IPw8OkFSTomldHg Q4t3AUnOgHZE+l3ZdoSEr62MD7vsVLFgnpbD2UNAZWebHLUWkKSZOubQQDUsWyZxxUcM EYSg== X-Gm-Message-State: ABUngvfSc5T8gj/T7YWKs7vMbb9wOqEADpmLjzFGCfCSa88tHHEK1OM3ogvHn8N3J05n2w== X-Received: by 10.159.37.34 with SMTP id 31mr6605592uaz.99.1477967677418; Mon, 31 Oct 2016 19:34:37 -0700 (PDT) Received: from localhost.localdomain ([181.22.27.27]) by smtp.gmail.com with ESMTPSA id q135sm7402289vka.8.2016.10.31.19.34.35 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 31 Oct 2016 19:34:36 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 31 Oct 2016 23:32:47 -0300 Message-Id: <20161101023247.892-1-jamrial@gmail.com> X-Mailer: git-send-email 2.10.1 Subject: [FFmpeg-devel] [PATCH] avformat/apngenc: use the stream parameters extradata if no updated one is made available 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes remuxing apng streams coming from the apng demuxer. This is a regression since 97792e85c338d129342f5812e2a52048373e57d6. Signed-off-by: James Almer --- libavformat/apngenc.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavformat/apngenc.c b/libavformat/apngenc.c index e5e8aa9..2b88dcc 100644 --- a/libavformat/apngenc.c +++ b/libavformat/apngenc.c @@ -101,6 +101,13 @@ static int apng_write_header(AVFormatContext *format_context) avio_wb64(format_context->pb, PNGSIG); // Remaining headers are written when they are copied from the encoder + apng->extra_data = av_mallocz(format_context->streams[0]->codecpar->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); + if (!apng->extra_data) + return AVERROR(ENOMEM); + apng->extra_data_size = format_context->streams[0]->codecpar->extradata_size; + memcpy(apng->extra_data, format_context->streams[0]->codecpar->extradata, + format_context->streams[0]->codecpar->extradata_size); + return 0; }