From patchwork Sat Mar 18 09:38:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 3004 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.50.79 with SMTP id y76csp621230vsy; Sat, 18 Mar 2017 02:43:51 -0700 (PDT) X-Received: by 10.28.194.7 with SMTP id s7mr1833142wmf.136.1489830231903; Sat, 18 Mar 2017 02:43:51 -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 14si14575510wrw.52.2017.03.18.02.43.51; Sat, 18 Mar 2017 02:43:51 -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 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 D185068836B; Sat, 18 Mar 2017 11:43:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f47.google.com (mail-it0-f47.google.com [209.85.214.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1E68068834C for ; Sat, 18 Mar 2017 11:43:23 +0200 (EET) Received: by mail-it0-f47.google.com with SMTP id w124so46181340itb.1 for ; Sat, 18 Mar 2017 02:43:40 -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=E78/LptAHXGJ304pdnwP7O5YMFyCgw3WVicT05uzb6Y=; b=NGjxb1GtdMmvoE09XrcrMkrxGeDinHCv2i913qxe8F8qYmP0uM54XXl50OiUrxCGAO /3J3gsHvUvQEZzSP0teEtrfb8KsdMa3xpgiRyW0OPt+q8ARHl2MSx504FJZBq7DktIzR 9cy/slP3yjK5GQCxXWJ7ym4pLOov0lDiii/+9aNFSOU9Ii/hMuV+1ydsYETROmIg3hKp +uYOIpyR7S6o63kR8fC67AaO6Ny1RrrhJzqnksf9aC8/rMxoZaEjMChVTRom6/0vmqUZ fqFtgSwBrJxk4LW0GYtdAsvgtCRAVr7m03X0TqsDFpU3b/FbOdK321TiVPKz6rR+UngK A58Q== 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=E78/LptAHXGJ304pdnwP7O5YMFyCgw3WVicT05uzb6Y=; b=DsbGlp7RvHpz4R5jC+CBuXSA40o5a+yrkDGq2GQuBAe1eStVEIKy/GRG2Euh+iY558 dBWt7TR8cywhkWHO5ph6swycnAq/53J8P8ZUPgKt9sgad5pUltWFMLnT7o0zGeWeKdX9 qv607QZs3XShW/BOpawXQTfR5eOkO3Z4VEntSGG7TMRRt9DZOrdeshS0fxhuUxT7eqf+ NDSLtI09I3JIlpzdPRPvrSp05HV2pHXVqCXLzWuSHza7hYVi63PZ1OdvpJczCztG+Kh+ qOdf5GBmdzQbu4PWdJxObJj9RkhbOWJjiOPiNAYG/sbJQWzQAS/unqBupVzYJxnSoL5X fk8Q== X-Gm-Message-State: AFeK/H1nEFfuID5UB0ozOZzQTv28jZWsEMV9QHmmbPUMsBsWxId/R9IKMzSdhDDJ4RNmmQ== X-Received: by 10.36.107.202 with SMTP id v193mr1949694itc.21.1489829893562; Sat, 18 Mar 2017 02:38:13 -0700 (PDT) Received: from Rodgers-MacBook-Pro.local.net (c-73-110-121-59.hsd1.il.comcast.net. [73.110.121.59]) by smtp.gmail.com with ESMTPSA id q185sm2274060itc.22.2017.03.18.02.38.12 for (version=TLS1 cipher=AES128-SHA bits=128/128); Sat, 18 Mar 2017 02:38:13 -0700 (PDT) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Sat, 18 Mar 2017 04:38:05 -0500 Message-Id: <20170318093805.20972-3-rodger.combs@gmail.com> X-Mailer: git-send-email 2.11.1 In-Reply-To: <20170318093805.20972-1-rodger.combs@gmail.com> References: <20170318093805.20972-1-rodger.combs@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/3] 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 7da2700842..9589f42741 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -514,6 +514,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) {