From patchwork Fri Dec 6 23:16:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16651 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 3CAA444AD17 for ; Sat, 7 Dec 2019 01:17:59 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1737C68B6CB; Sat, 7 Dec 2019 01:17:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3FC9F68B6BD for ; Sat, 7 Dec 2019 01:17:52 +0200 (EET) Received: by mail-wm1-f66.google.com with SMTP id c20so7465916wmb.0 for ; Fri, 06 Dec 2019 15:17:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=eiIscj3F1OBxBfg4qkEwOKpG0JmZ1FyP91frtZ51w4M=; b=qhVNMBHjYXDy5m5KvxzmxyceR5V7S/2OjrqS8Xyhuys2+d5eec68CM479LkVDa19k7 gNYLtgYQuU7OuE4ZTmfOpAw1BVjNkMnSeLePYJCUjxBtqm1kuI17+9GdSsxzXvPVEqUv vF+SU2iDsTSbfaU9JW39kyOcP2LePgkpYcvonWLgHXpW/VhmXAPbCGXfQDczx40x9zSm W15nR1Xev+Qn1y4WEr4bnGEYkeSbcN6kbKBwUEwdD3jj4bqpR8BufQjWoNLqwfL2gAe+ 5RzTuDbx+hsDlht3EYIpY8xcZvL07mbCigPtzOxgjiPkGEKiUhXH2MA2UwQ7xlV5Ux+N kLnA== 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:mime-version :content-transfer-encoding; bh=eiIscj3F1OBxBfg4qkEwOKpG0JmZ1FyP91frtZ51w4M=; b=uYawPbmkhvQ9l7Mj6JY1mv0C228BHkmhJyTsROl3kOMd98oilHdGrfk3AzMZ7Riy00 K9eSypLE0djbiTdPmILkLTPwnkrWD9F2U4AxFVdk7zrhKqirf5lYPG4TiUcodfDHPkux kGBiJ+fVc6krMG/LPRxUQmUCjiGZfZ4FAQOe7tg1Hl1+G94z91EQQvLLEU1R+4B04q+I nPT7CQF1e1eloJg1uBsi1xg6SnCLKR/D8ZkHL/BFnWH0VWWLskQ5hQSqhS01rs+kzMef ZxMinS3SCIVfgTbaxCYxCZb9+cYPcrPaYi68LdKK3XPNUxqS7/1fApRilI3P9xiB6vls 7bHA== X-Gm-Message-State: APjAAAWRYPN6OpB/IMAtN6Mch2nEWa3+Na45tpB5sl1NxYGJ1e0TYGxy 7uGriz4+Bj1RF4DlFsUhhioGgu8x X-Google-Smtp-Source: APXvYqz6DYFQillicHUxQ3sDipbA1rF7jRGbG7rn4LH53X1KHTvl8Jt706kgnEcwlddWbac3kmcwqw== X-Received: by 2002:a1c:5f06:: with SMTP id t6mr12149755wmb.32.1575674271545; Fri, 06 Dec 2019 15:17:51 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08e23.dynamic.kabel-deutschland.de. [188.192.142.35]) by smtp.gmail.com with ESMTPSA id j12sm18758461wrw.54.2019.12.06.15.17.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Dec 2019 15:17:50 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 7 Dec 2019 00:16:17 +0100 Message-Id: <20191206231622.13672-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/6] avformat/matroskadec: Simplify check for real audio 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" Signed-off-by: Andreas Rheinhardt --- libavformat/matroskadec.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 162697ff12..908ad097cb 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -3593,10 +3593,7 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, AVBufferRef *buf for (n = 0; n < laces; n++) { int64_t lace_duration = block_duration*(n+1) / laces - block_duration*n / laces; - if ((st->codecpar->codec_id == AV_CODEC_ID_RA_288 || - st->codecpar->codec_id == AV_CODEC_ID_COOK || - st->codecpar->codec_id == AV_CODEC_ID_SIPR || - st->codecpar->codec_id == AV_CODEC_ID_ATRAC3) && + if (track->audio.buf && st->codecpar->block_align && track->audio.sub_packet_size) { res = matroska_parse_rm_audio(matroska, track, st, data, lace_size[n],