From patchwork Fri Mar 30 14:10:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 8245 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp2937159jad; Fri, 30 Mar 2018 07:11:44 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/qADt4t7r4MLzUWOG+BlR3pwl/QqJXFR4n3C1O7dDlPULboCUraApwJ0wsyBpupiXUFtGg X-Received: by 10.28.193.13 with SMTP id r13mr2213267wmf.38.1522419104727; Fri, 30 Mar 2018 07:11:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522419104; cv=none; d=google.com; s=arc-20160816; b=Mg9Go9CKzO63YoMiJ++pJrimqlLeaE9vY+9YbERGjEbs2ezLTJ5bogeXgjBaHmjKu4 4NlBDZVqqdvJqztsrNzpPBHP0bVH1GKpmqQDfjKx/w+LJbYrCfnyl3+fl/8aD/rIjs9V DaFCPp1kZMh2o/ztfzw2Ms4aa4P95Nm+uof8M0F9qAswY6KY+Jw3iWCjpwJTS3FaX4Vd FJ3/4ecnQUDEVh/sRCd3X0Y8HX4d46B4F8HKCN5+IfxK7dypaXscmr2kT8A8LRgBd0tL M88mlUw0kZcrz6EGThw9bHUpyUHMpETONeSa1X0Nw8MmFCKz/yXhoffqDplYAu17u8tk n9sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=c12K1UtPYZD2y27jx9T0Xma/5XjZBq8F7CXFQcE49GI=; b=dknpj1On5xLjTYlV7sb7qDi7dKTcYywsmaie3rXB5098OgiwpSrp1PIYREinj8ThI/ eFOgOXiut/qtskLShPjOsS66OXrLzMMHOOPhjhuk0Q7srIiy+L0l5rtqIVTM3gFAafgh tfxaQSiqlC/ZpSW3Ew07qnwN/VpHdpQrzyPC+6B9VWoN/6fsNbjDECSVN6CgWAEmLCG0 L4Hj3EMi4bjSMMDp908wZvaJvOaQ0TSvMw1IgR8/oJjTwfZgg2+5Wjhx6eabBJ4b1646 udRJNM2BnziCcRYkKbGHHJJMfPlL7GQIn1DCSLF4ZHc8xuJKzEvORKJWi+G8sk9ydsZX prEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=dHoYtEbO; 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 sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g7si6377906wrb.33.2018.03.30.07.11.43; Fri, 30 Mar 2018 07:11:44 -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 header.s=20161025 header.b=dHoYtEbO; 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 sp=QUARANTINE 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 3D477680C29; Fri, 30 Mar 2018 17:11:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5F2DE68067F for ; Fri, 30 Mar 2018 17:11:17 +0300 (EEST) Received: by mail-wm0-f67.google.com with SMTP id h76so15868662wme.4 for ; Fri, 30 Mar 2018 07:11:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=Xq/oUPz+sEf/uRj6YgDgmxkAUQOKuDBzxasnSTNvdlE=; b=dHoYtEbOpk9WcH/J4nQtmeuCfOJmA9lH3gcmOkdex3MTl+yzJC9lHNRJ08teQJIGE/ wLZZLRCNui3/yQ6z1zJTr6609RGYaubw19JxGcr4V+KS0FHBur9xyMWkRTeHS+FfhY0u PDK07TMrYDaB1SxmXBnYGyG3yKL7r+2R68zd1cyWR0tKn0LTkGvaiPb0jQeuDsut0+/4 wfbiAQo9G3BMtNj+QoEcS8K5nt4+ClshmorUYdy2aWQYnbmpv96io9DfNZdt1IULKx8s uzXFVTKI25nPkW/zbTGyROWpxWRWgRs1sfxrjThWoIxVixtslUbZK2f6NpGYkvKY/PmQ GTjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=Xq/oUPz+sEf/uRj6YgDgmxkAUQOKuDBzxasnSTNvdlE=; b=Hqo3//IQ4AtFdbI/1m71R1aHwnBYLjclYY9rJXh237RGcWVuYze9jog4yUePYtzjiS fmV5c1xADOR4TUsQYaQ/pGtvn5RSVzeoEdGojWYYHbnxMrRHRSPox42BfyFgTPVDUa1N EK8O9NLRu+GGemF9zPVvJH/OI1q4UTDAUCWiTJfPkT2x6f247ufCCUGiQvVcJmTUWdh0 IrgOYn5/a7TY16FwI7PUV6sMCeuQjVimpiD/cBVf0M1GZ69DDq4zzQigSO73SsN5ect8 tQnmEK7IfIjPHQKG+NVaC0VB2AVDlhVKwK+pLfa48sf6/AV6WaQGPSpI6D357YlmbR2p TTxw== X-Gm-Message-State: AElRT7Gnm3Q89Iaj33uoV7GqrNQUQ+QN4dMjTsNIF3nh03uubv5gojJp dFByd7FpuHkf6yU1ljo6EWibEA== X-Received: by 10.28.141.85 with SMTP id p82mr2279787wmd.19.1522419095718; Fri, 30 Mar 2018 07:11:35 -0700 (PDT) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id r196sm5859326wmf.9.2018.03.30.07.11.34 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Mar 2018 07:11:35 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 Mar 2018 16:10:52 +0200 Message-Id: <20180330141052.19258-1-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 Subject: [FFmpeg-devel] [PATCH] avformat/mpeg: fix PCM-DVD mis-detection as MLP 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 #6563. Signed-off-by: Paul B Mahol --- libavformat/mpeg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index abdc6a937c..69d4a9d8ac 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -568,7 +568,7 @@ redo: codec_id = AV_CODEC_ID_DTS; } else if (startcode >= 0xa0 && startcode <= 0xaf) { type = AVMEDIA_TYPE_AUDIO; - if (lpcm_header_len == 6 || startcode == 0xa1) { + if (lpcm_header_len >= 6 && startcode == 0xa1) { codec_id = AV_CODEC_ID_MLP; } else { codec_id = AV_CODEC_ID_PCM_DVD;