From patchwork Thu Oct 19 07:39:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 5628 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp2268467jah; Thu, 19 Oct 2017 00:47:11 -0700 (PDT) X-Received: by 10.223.175.87 with SMTP id z81mr675885wrc.12.1508399231842; Thu, 19 Oct 2017 00:47:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508399231; cv=none; d=google.com; s=arc-20160816; b=DKaEKC9tIE6+a5EyK5e8u9RN2CTQmZLr7HRFnvGrHN2bZO7QC7GdYivI442axioGpT SODFx+2UnMEyTTY4vnrczAbp9s56seCkQcVqg9ReQnHbAvuYnrDlKmuluZiOU8RSGAkr 78ZoHI52LV2+Yv9Hw0OopRZXtrm/RUjoc3qs5ThPuJz4+oYSzikGFPEL9xyPRttw5d26 VdC91xAcD+7F9UJEMg0+3s27HF769sskZRHEIMAi5HnlOlr5pW0KT9+RhEsT12D/oiA0 pgtP+WJbN7RzOtrHn7F+uOd6bxVqDMOzUU5G308GbY2mkxTdTO8BmJQqssUSNMxdJyoq Sz0Q== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=wKN0d0GqiejyBQfnRPsb1eIU29XwJDOhsF98VtTQ8PY=; b=xiRyTv2ssAnVf5JCfaa8Ppf0emwBR6V0WJKLnblM7tz/2ehpIA/uJwOP/uYxqCqyTD xlTvd+1WdFKaneFEph8VluBN+uq8e+x0EZDsfJYUFtu1qefo8vHw2HRDViIp6Z4dq+rs X9whuWke4YqSdKHVuFoWTK/7vuwF7ZqhksR1sqDah7sSh7kOefb2S40tg/w8LMwBg8cZ OKTvTgxspzvebJkpfpF8ORzQ/tRnQ51C2jSJi5iKGCSEKJeJHq/cD95zTV/jpVHbe+ZT hCrUs4JpMxVlMOSEHbGlf7tmIwhjb4IbqZ2imxvpmpEW0+F2OTDPSwTFfjUZlDV0Eq9q sDuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=FatEN+8I; 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=NONE 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 137si631326wmm.33.2017.10.19.00.47.11; Thu, 19 Oct 2017 00:47:11 -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=FatEN+8I; 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=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 61FD3689A14; Thu, 19 Oct 2017 10:47:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f66.google.com (mail-it0-f66.google.com [209.85.214.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5DB526898E2 for ; Thu, 19 Oct 2017 10:46:59 +0300 (EEST) Received: by mail-it0-f66.google.com with SMTP id n195so9914476itg.1 for ; Thu, 19 Oct 2017 00:47:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=CMIEiZ5Us3mK5LTUrXV+f2yOEVZlDzlp8pJL+QTnUVc=; b=FatEN+8IVId7+Fh1RVHxLyfivBOd2TFiIEou1VVACjGorZ5P7ZLlx/ObgmYPwW7ArP VjM1ZPtICPBH36JV882BA+K8EJdZ04/03tKX7uzFfypAnkijjGy7ga6LngudOSHjjChD A2mu93uOJPWphcSm2Imlc92CzLgiq5dMOhnyrPYELzZY+cd+iNBGKUxOTBE6SR5cUQEU 4jH/WYNb53wsZ48nwbC8hUZwmqKzFBMp8Yec7V6TwdAQMCdIeWCxnTG/Dp8JMLco4xeg rsx99kqjqrWkXF77L/X0kfBXUlR6bIYT5omFUH5WxfafMchLA1H2AlyYd5GcjYzzlbsy ndug== 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:in-reply-to :references; bh=CMIEiZ5Us3mK5LTUrXV+f2yOEVZlDzlp8pJL+QTnUVc=; b=W/2vOrDyVHpHAU7bcmhIsPgvuohJ2OE07N1zUH6ieVwBM+ASZJKBMuOBgadP7sBbSg uBJycmaayIS2efOISOd5pg4EbyHmB2DRpZS2UkRIqQhAFrvNUkqbjWb3OSRlaEjU63Bl PLqQMvY1DU5HG45GX53Jatd0kdSpbh3cCt3zU3QH7I0edrC4KlujEbeqp7C+tBQdek0X AdFTFbkth5RtKDW8LrRcUH80gO9ZfKhRFLuuZ1dmWFlwWuVlF0PC2+TNwq9j2LRaebjj g/BLqbvY0Dry6ftLoiE/0AZUpiDB+2vC6H8ZVuCuOA3dtOsstQuNnPlH1816qRVJ1HFn H+9A== X-Gm-Message-State: AMCzsaXaSsrZsytNDB4tuy2Z0So4TTyB7MZ2nzN5LgBB8fDl1QR9DmSX 3EuC89BytC2ZKX0EDTnvxdmvof0d X-Google-Smtp-Source: ABhQp+TrUdcxH4EodY0f9xl2tusy1ZgeCvU80uSqk3aSaFgxVUi7aRc7v9/UoW2JQyriMWngT6sliQ== X-Received: by 10.36.108.81 with SMTP id w78mr1313029itb.140.1508398804288; Thu, 19 Oct 2017 00:40:04 -0700 (PDT) Received: from Rodgers-MacBook-Pro.local.net (c-73-75-100-12.hsd1.il.comcast.net. [73.75.100.12]) by smtp.gmail.com with ESMTPSA id v4sm6700186iod.17.2017.10.19.00.40.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 19 Oct 2017 00:40:03 -0700 (PDT) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Thu, 19 Oct 2017 02:39:48 -0500 Message-Id: <20171019073948.23683-4-rodger.combs@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171019073948.23683-1-rodger.combs@gmail.com> References: <20171019073948.23683-1-rodger.combs@gmail.com> Subject: [FFmpeg-devel] [PATCH 4/4] lavf/movdec: request probing for an ambiguous codec tag 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" --- libavformat/isom.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/isom.c b/libavformat/isom.c index 77983c5eaa..8b3f88ce74 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -519,6 +519,8 @@ FF_ENABLE_DEPRECATION_WARNINGS codec_id= ff_codec_get_id(ff_mp4_obj_type, object_type_id); if (codec_id) st->codecpar->codec_id = codec_id; + if (object_type_id == 0x6B) // This can be either MP3 or MP2; let probe_codec decide + st->request_probe = 5; av_log(fc, AV_LOG_TRACE, "esds object type id 0x%02x\n", object_type_id); len = ff_mp4_read_descr(fc, pb, &tag); if (tag == MP4DecSpecificDescrTag) {