From patchwork Fri Aug 24 18:15:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stebbins X-Patchwork-Id: 10119 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp3666969jap; Fri, 24 Aug 2018 11:15:50 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZ74kRMCs98eefVt3pEwkTF+kyov8lfnUJ4dvv5HJIl2PZAnKQOS4XfEkRS/VO72Xc1Gnqt X-Received: by 2002:adf:92c2:: with SMTP id 60-v6mr1958695wrn.153.1535134550130; Fri, 24 Aug 2018 11:15:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535134550; cv=none; d=google.com; s=arc-20160816; b=B7m0oFQT+43VXNHW4Nrnp82kwo/so8LYT1SJ6IqsOr50pQhKAGhw0Q5zHj89DHYxbM 2ajS0Ncl4oWn6Kk4c14p8DGWvLf+BA242MYREOdNv6XrFuC44Zwm3xWp2DtWqsXxaz1s wDqbQwzapNv8JCEJGU+Ko+exWVTH5Q8hDbVQ5o19f+EsizeRyndm9++RylR0pSSVOySc jDgokoRbObuaxq+xaOIefVDyEbLnNAgRkPELThkuXuHBiCRSBvyrG/AGOCcgwq+dYK85 gPtZcP4rMVtRcoXSLOxPwHk+gYTuHivZLEMAiIkrJi82BNiTpKoDqqdRagBSASQGmQ/u /YRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :delivered-to:arc-authentication-results; bh=A0gDk3Ovj0etddda9kP5r+iENBanOO+PiVgjZ49BSsc=; b=eGDXW6s7Gy9p2UYsoGTBvMfIjaqcz1urbrZStr9nz9WNFlXgoDejUt60sypRK9XqRm 82ix0P6nFdf+Axs4cmv9urIL9Hj3rsB846d3TKBUgVA3UP4ReVTUNKuWuqgMVYjh+rK8 6cbrxsTUznYndFkPKFZ+Wv9Km3DzGcylOVhWg01/VDTzDdJ7m2YwN3NiTd1YeraoXD9k acRAhc/y9ONqT+6j4qyPCpMy8BRYXJzUcls1Q6Fr0lvQ4PdSgCh3z965N+6Ux5q59sI2 QNqYK+R2Trzv17I1Q+bJfHanX5BSvne2XiBkatmq90UtdllfkAYi2wdTbSNUp4rr64oy pjXw== ARC-Authentication-Results: i=1; mx.google.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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h187-v6si1490401wmf.40.2018.08.24.11.15.49; Fri, 24 Aug 2018 11:15:50 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6F52E689EB8; Fri, 24 Aug 2018 21:15:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.jetheaddev.com (mail.jetheaddev.com [70.164.99.34]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D62AF689915 for ; Fri, 24 Aug 2018 21:15:39 +0300 (EEST) Received: from dionysus.jetheaddev.com (10.13.12.63) by cas.jetheaddev.com (192.168.13.27) with Microsoft SMTP Server (TLS) id 14.3.351.0; Fri, 24 Aug 2018 11:15:38 -0700 Received: from dionysus.jetheaddev.com (localhost [127.0.0.1]) by dionysus.jetheaddev.com (8.15.2/8.14.7) with ESMTP id w7OIFcBh005482 for ; Fri, 24 Aug 2018 11:15:38 -0700 Received: (from jstebbins@localhost) by dionysus.jetheaddev.com (8.15.2/8.15.2/Submit) id w7OIFbhl005480 for ffmpeg-devel@ffmpeg.org; Fri, 24 Aug 2018 11:15:37 -0700 From: John Stebbins To: Date: Fri, 24 Aug 2018 11:15:33 -0700 Message-ID: <20180824181533.5433-1-jstebbins@jetheaddev.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-Originating-IP: [10.13.12.63] Subject: [FFmpeg-devel] [PATCH] lavf/movenc: Fail when codec tag is invalid for format 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes ticket #6897 --- libavformat/movenc.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 8ad7026741..fb001f9195 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1596,23 +1596,21 @@ static int mov_find_codec_tag(AVFormatContext *s, MOVTrack *track) if (is_cover_image(track->st)) return ff_codec_get_tag(codec_cover_image_tags, track->par->codec_id); - if (track->mode == MODE_MP4 || track->mode == MODE_PSP) - tag = track->par->codec_tag; - else if (track->mode == MODE_ISM) - tag = track->par->codec_tag; - else if (track->mode == MODE_IPOD) { + if (track->mode == MODE_IPOD) if (!av_match_ext(s->url, "m4a") && !av_match_ext(s->url, "m4v") && !av_match_ext(s->url, "m4b")) av_log(s, AV_LOG_WARNING, "Warning, extension is not .m4a nor .m4v " "Quicktime/Ipod might not play the file\n"); - tag = track->par->codec_tag; - } else if (track->mode & MODE_3GP) - tag = track->par->codec_tag; - else if (track->mode == MODE_F4V) - tag = track->par->codec_tag; - else + + if (track->mode == MODE_MOV) tag = mov_get_codec_tag(s, track); + else + if (av_codec_get_id(s->oformat->codec_tag, + track->par->codec_tag) == AV_CODEC_ID_NONE) + tag = 0; + else + tag = track->par->codec_tag; return tag; }