From patchwork Sat Nov 5 20:50:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 1312 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp445012vsb; Sat, 5 Nov 2016 13:51:14 -0700 (PDT) X-Received: by 10.194.47.42 with SMTP id a10mr2852579wjn.216.1478379074767; Sat, 05 Nov 2016 13:51:14 -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 p144si3231549wme.14.2016.11.05.13.51.14; Sat, 05 Nov 2016 13:51:14 -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 2DC1A689EA8; Sat, 5 Nov 2016 22:51:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vk0-f68.google.com (mail-vk0-f68.google.com [209.85.213.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 027A7689EA8 for ; Sat, 5 Nov 2016 22:51:03 +0200 (EET) Received: by mail-vk0-f68.google.com with SMTP id w194so4525433vkw.3 for ; Sat, 05 Nov 2016 13:51:06 -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=uDtKE4Oy49vpyAiPLk6bmuT7hrrv5nvzGsQ7VaofwXk=; b=MWI4UJfLI6v5Gd0fx7Qg+CQWFozbOrYOWJ7Wo3oKzSkhga21HSIj+ZAd5FopPvGh5m 7ZSUAQuQqCJDcsDCsGznhCfKTi41IpxVGLk36B6KxMTGIg9HdWzmyBh7MkMkT9IReO3B X1OOL0gJuqXe4OfOttJD3MO6WcfFlZEyGnPmGWoM4mIzu0EkqYZPYCBthMtK51PCN+BF uedP0kLqKJCQmtXPA2WFxTaq4QJVp/+I5glbSk1XqbRdTmKMLxO74cZV1fyFcZ5IzxBJ cLRq3jg/ERq681EB32K3sHjJ/aJInMdY9gR1FORDa/cf6WtLlJS03Cie663muLbkruXn dB6w== 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=uDtKE4Oy49vpyAiPLk6bmuT7hrrv5nvzGsQ7VaofwXk=; b=Lv6fw7mw3NAMY1WCWYRrQLaQfpRIyLj+SB8567KNkgfytjZ8DkD9rXdVSTKEOWvceW HIvTFERbDaUJSJzuZygX30FJ1X1dV6KPVeK5t68de+85AMvElVHNv0Jii7T3wBqIVDQ0 9vhCfg7ciQHo+bziOZaF98XB5GhYcjyEyhKc/qa91HSJCaRyN4kOfnUVnSieU3gmJVa7 ikgFRlaebHGdASIELG0m+9GJ4qLbRfFeFQaL0/DezySituTaRDo77H8CZZvURwLHvAPj tUfsSwG4iYiMSfsl1pQadOCVqEHMUBaSADm4CUJvLawi/RqmdiO5rlzBFvrFoSJNDUv6 s20w== X-Gm-Message-State: ABUngvf8aga0P3mGRoyUHdq/Ewk2n1XBbnl9XhWbiqHgvs+bHMi6/iHD4G1HxPGb7f+0dg== X-Received: by 10.31.214.65 with SMTP id n62mr8817620vkg.127.1478379064908; Sat, 05 Nov 2016 13:51:04 -0700 (PDT) Received: from localhost.localdomain ([181.22.28.194]) by smtp.gmail.com with ESMTPSA id q7sm4356847vke.20.2016.11.05.13.51.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 05 Nov 2016 13:51:04 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 5 Nov 2016 17:50:24 -0300 Message-Id: <20161105205024.5536-1-jamrial@gmail.com> X-Mailer: git-send-email 2.10.1 Subject: [FFmpeg-devel] [PATCH] avformat/matroskadec: fix DiscardPadding element parsing 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" If the value is negative then it means padding at the start of the packet instead of at the end. Based on a patch by Hendrik Leppkes. Signed-off-by: James Almer --- libavformat/matroskadec.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 32f5e49..5a22193 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -3082,10 +3082,16 @@ static int matroska_parse_frame(MatroskaDemuxContext *matroska, av_free(pkt); return AVERROR(ENOMEM); } - AV_WL32(side_data, 0); - AV_WL32(side_data + 4, av_rescale_q(discard_padding, + discard_padding = av_rescale_q(discard_padding, (AVRational){1, 1000000000}, - (AVRational){1, st->codecpar->sample_rate})); + (AVRational){1, st->codecpar->sample_rate}); + if (discard_padding > 0) { + AV_WL32(side_data, 0); + AV_WL32(side_data + 4, discard_padding); + } else { + AV_WL32(side_data, -discard_padding); + AV_WL32(side_data + 4, 0); + } } if (track->ms_compat)