From patchwork Wed Dec 21 04:48:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 1881 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.86 with SMTP id o83csp2075457vsa; Tue, 20 Dec 2016 20:56:08 -0800 (PST) X-Received: by 10.194.148.134 with SMTP id ts6mr2390255wjb.220.1482296168521; Tue, 20 Dec 2016 20:56:08 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id lr1si25912993wjb.36.2016.12.20.20.56.07; Tue, 20 Dec 2016 20:56:08 -0800 (PST) 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 44B7168A28E; Wed, 21 Dec 2016 06:56:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io0-f196.google.com (mail-io0-f196.google.com [209.85.223.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4722868A24F for ; Wed, 21 Dec 2016 06:56:04 +0200 (EET) Received: by mail-io0-f196.google.com with SMTP id y124so24684339iof.1 for ; Tue, 20 Dec 2016 20:56:04 -0800 (PST) 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=nAgBO8XKPE9111QXh61ZWp3itYwl1bfVZhzrbeqm72k=; b=GCbzaSbgNs62lCPwvIBHl1QSCtfBsYiHexkinkDVEZtVehbr91rySImxxEXOhH/9XW qSJoVo/q4zP30yuMVfWj9TdsGtd7MF1vQw7wgP2NMQeyU+EINHYT57caAm/VZEhlZsQO UObkJwz0enHfmQPS04k96qP3moSNKq0ec1iYZEMUSWLy2Y6FtE9hrORzx9QVNu35To9+ E5rY5z4bT+qZ47DthYe/OYbcBxjDBILqHMpOAZI+s2NxBKR8H8+1laP+q23x+FS2M0iz 0PQZzSn6SHlIV1gstTQJ3UGhiAYvw5wutgHGqtkiVXguWYFZVDLEhf8JVqDxl7LqH8ID Xg7g== 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=nAgBO8XKPE9111QXh61ZWp3itYwl1bfVZhzrbeqm72k=; b=aok/CgAclZXsQ8c9cU18wgw29ewCMI/GoUDiye2q/wiW9G1tM2WXeo9JnRNfifdtG1 OxBPII/GjoBzrhyteQ1FM7NCyNIc7y68JxPjCNiZCbl9i+eSmMb0X34bNaSJkg52OQnP ssL74LXf8nE64xIgKJFUKjL3ktZ1NEJte7LQFazCC1t/PSh6DXFNYZLUOI0yjQbYDvCa xH2X79vsr7KC4hFO4lcNdgSyAm10G8/Mvz5Q2b51stAUbN75DLnRfFCEb1RKiyxcRu/t 5X+WpDo31jg7Ntd/22OIjNIclDe93wNXqXTV7LVwTjMtyPen0HFeK8fq3AfPVXo3dBNL ey2Q== X-Gm-Message-State: AIkVDXL7pgnKzGl1ZPbGkLyKKHmB9jvZnYL/38SwABSrDiDf2v39NYxKjCHvJsxy8ooshQ== X-Received: by 10.107.189.196 with SMTP id n187mr4096124iof.88.1482295703218; Tue, 20 Dec 2016 20:48:23 -0800 (PST) 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 s13sm2935409itb.17.2016.12.20.20.48.22 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 20 Dec 2016 20:48:22 -0800 (PST) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Dec 2016 22:48:14 -0600 Message-Id: <20161221044814.87331-3-rodger.combs@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20161221044814.87331-1-rodger.combs@gmail.com> References: <20161221044814.87331-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 ae10cb7d3f..37bfd5af30 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -509,6 +509,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) {