From patchwork Sat Jul 1 15:22:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Derek Buitenhuis X-Patchwork-Id: 4178 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp7096532vsb; Sat, 1 Jul 2017 08:23:08 -0700 (PDT) X-Received: by 10.28.21.202 with SMTP id 193mr16876483wmv.99.1498922588236; Sat, 01 Jul 2017 08:23:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498922588; cv=none; d=google.com; s=arc-20160816; b=EuQpUgOxj6pWuroMi2PPjlVqrlo9Onye5EUpYdgkkAkM23V3GmDPaGmtbboXxQK51N fJRqZgJ/wJLFS5wq84qh/iOKz6da2pMARxD5WxVg4acRPbrnOTvvuR/LQr5+xM21K2ut pM1Euj5fh51sCRrHU0nImJYiBpp5UoxL0INOJ9iiMjNqhaHQBlioZ2QD4CsFF3F3VjmA iwxmvWoCGCflfpK9OXhigkJqyZ0OS/aIwZdKiJkEC9ZS2KEvAUN7KEPcuttw3vLMG9QI fa7FByw7TF7ygxbQacWM2mBzjdXRTN8WHuYK7j7nbCvRh3Tw+894jn6v0kDYJBV7RsQ6 DbzA== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to:arc-authentication-results; bh=XW23N+3zLwuX4KE+8AdWrd0A8GcCVMbqg6zMzgAFnhM=; b=PeABnY5Jv4Pu9JhP3UXmEo+OZISzUzb3+5in8ANO4iyQvBsues4mFAglVKe9vPCh4+ VyPoqa2VL81c0TPHHry9xdj4vVljm1ONHdKXlg6Qxhf5YfGL4bh11kgYj8OHPuKi1c0p srUpA0lPDgcdy9xtMhESB531rMI1nEwcCXULZ2mkjHmweedpWR4i1Hdz4S5a3XuSSXaP ScMVi9/jyZViHhBBZvK0hbqOFd3Y/icGJsEmYiUGDV9FTo4ByrzOCUD9qgao7vxxs2rj mw1yRtk7tIHaXgUcpEf8lBJNJRWKrs+ZKKVOiNrSJnQOZjRwk1KVSU9JPs7+81P4KX1I e9Xw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=R0u+o1j6; 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 65si9267308wrc.166.2017.07.01.08.23.07; Sat, 01 Jul 2017 08:23:08 -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.b=R0u+o1j6; 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 652EE6879A0; Sat, 1 Jul 2017 18:23:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4C9B0680457 for ; Sat, 1 Jul 2017 18:22:57 +0300 (EEST) Received: by mail-wm0-f65.google.com with SMTP id p204so12829768wmg.1 for ; Sat, 01 Jul 2017 08:22:58 -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:mime-version :content-transfer-encoding; bh=eXzvIG4VtEn9j+HQ7U+QCD4vqW5BZ54VmdB3j+EKcxE=; b=R0u+o1j63t98PzERisaS3sXA/dDGFjhMmw4GrZ5sAj8CWRbpmIVKzYfwrCE6mD1tzt oHHFyq9HwvDCWsIYxKRNnoGH4TvUGFNT7E9aHzAXpxhm1E1bPrdWyJeGUFHciHDgdH50 aVG8v9eKLCyOocEqv72IqjXgqL4IyFEfTLNAJ9UI/h29GWgGwxQ49e7Xjza3bixo1a9T LGlSdBGipDEdSZq18PkVJwT/Bg81MaPaUUy6RqtVVLEipvPjrz4MjVunAXWW+PcJAVR+ 71Nm8ZcTHOqGJvN/Ors0Qjb3kqK9tVouwCHUsQsLXuRH2HRCQbmDiAxl6VAJSWyEAt/7 LVNA== 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:mime-version:content-transfer-encoding; bh=eXzvIG4VtEn9j+HQ7U+QCD4vqW5BZ54VmdB3j+EKcxE=; b=YvJJaCKl7ww9p0X4NXZHJXkqE9QpveWBrr6b/nNTngJp8I8elTMTcZ4hEnYLC4vOCQ x6GZ+bWzfpswEcjFdz6yUBNoC08RBn1Y7L8eMmCZZSREWIibrBJSU8KBo7GsHwBLMuJy mgTOeJipcB+Ks6YI7/wXQQ8DmdpXDIBavuJj5oGEBW/GKJ51ZxDsNCrzpgyZ4iN8WA0J bOY7bkgbjlO1iqUYYiKVAgYzkHkPS9ZjV9alJq9yh7IGSjdzuIyE/6JiKrWQgLACDLTn OHbfEuuTHPvglsu8bFvBDNv27GiWkB7EXNMCdjl1Iya+maVddhPaHOF/BUyg26oONM4y g/ww== X-Gm-Message-State: AIVw112nnA1BLGy7zWgO7BnviUv+L6ZUguXb8p4/hrWLN5AUpFhP5lnD itPhyQy74vRC7dFaPno= X-Received: by 10.80.196.79 with SMTP id w15mr494873edf.124.1498922577354; Sat, 01 Jul 2017 08:22:57 -0700 (PDT) Received: from vimeo-vm.localdomain ([62.208.38.79]) by smtp.gmail.com with ESMTPSA id e28sm5451625ede.14.2017.07.01.08.22.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 01 Jul 2017 08:22:56 -0700 (PDT) From: Derek Buitenhuis To: ffmpeg-devel@ffmpeg.org Date: Sat, 1 Jul 2017 16:22:21 +0100 Message-Id: <1498922541-10941-1-git-send-email-derek.buitenhuis@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1498664522-44645-1-git-send-email-derek.buitenhuis@gmail.com> References: <1498664522-44645-1-git-send-email-derek.buitenhuis@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 0.5/5] lavf: Remove codec_tag from dashend and smoothstreamingenc 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" From: Martin Storsjö Skip the codec_tag altogether here, to let the user (try to) set whichever codec/tag he wants; the individual chained muxer will reject invalid codecs anyway. Signed-off-by: Derek Buitenhuis --- libavformat/dashenc.c | 1 - libavformat/smoothstreamingenc.c | 1 - 2 files changed, 2 deletions(-) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 0f234bb..bdb332c 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -1089,7 +1089,6 @@ AVOutputFormat ff_dash_muxer = { .write_packet = dash_write_packet, .write_trailer = dash_write_trailer, .deinit = dash_free, - .codec_tag = (const AVCodecTag* const []){ ff_mp4_obj_type, 0 }, .check_bitstream = dash_check_bitstream, .priv_class = &dash_class, }; diff --git a/libavformat/smoothstreamingenc.c b/libavformat/smoothstreamingenc.c index dabd1ea..083af49 100644 --- a/libavformat/smoothstreamingenc.c +++ b/libavformat/smoothstreamingenc.c @@ -647,6 +647,5 @@ AVOutputFormat ff_smoothstreaming_muxer = { .write_header = ism_write_header, .write_packet = ism_write_packet, .write_trailer = ism_write_trailer, - .codec_tag = (const AVCodecTag* const []){ ff_mp4_obj_type, 0 }, .priv_class = &ism_class, };