From patchwork Wed Jun 28 15:42:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derek Buitenhuis X-Patchwork-Id: 4152 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp3456565vsb; Wed, 28 Jun 2017 08:51:00 -0700 (PDT) X-Received: by 10.28.113.21 with SMTP id m21mr8575038wmc.80.1498665060684; Wed, 28 Jun 2017 08:51:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498665060; cv=none; d=google.com; s=arc-20160816; b=G46sfd9nEwz7DOdD2SjYZEm/41xKnZYK8H3ufRUTI+V3LZ+TDnob5Uori5XRHLwKHK xGztE57RyR99ahSl24+3nP1+qCICUuhRsDpJZdZ0SkGf1yEW/9/oubhxmMBWBMYmJnif xHXouO9s1STWSDJPvCOmvUnfb3rLBelwFPPbRRshrI8TjCOEBDd83HlFGV6FT1o+8CNO El33kzKgpU/1GXk8kxt0S8k1VKPLRmsEIy67twWOnndK0rK45nY0GlVux3EbnFeeHvDA TXWEqeyuPwak0ygUG3epRYRxNzeXKDfmqVyIg16V+XzrYATeWgBD1GchdL+X3rjONWPF kMLQ== 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=YzkLOiDteHQbBnn8k2b4m7qJg3REPc3LbBiIdX/abLE=; b=d2QOO9+tELIWHxgCDQZMMv1fwo1+clDfYdygisCr6aTYejn1MfGA/NPJtET2qO1ILk 4UAyMENT1gihSt6FirPP5vRUeSfZaICwxobSg+kgAxZwXwv3FI7WCVgkr0DhgRiYEE4N gy168eF3Xeh1ql/WXj6L+/zP2/4AjiazWGLQKrXzGcDARiEwBv7qZ+vkQOAl2xKqWRac HAtP9Ez3ZxqllH7aXnhDjACPXqG7DccUALqvWS7MChIsCWjeLs8qm9FzMBjsqwBw8krn 6FzKECOgpd3ZkdKFUZFf+to/lQVolXUELQdmaq/O/deN2QSHCHJGuSlTVIaPSRtRWZCY DwYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=QjMKW+qJ; 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 m143si6032667wmg.179.2017.06.28.08.51.00; Wed, 28 Jun 2017 08:51:00 -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=QjMKW+qJ; 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 08E5968A3EA; Wed, 28 Jun 2017 18:50:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 30C6C680A4E for ; Wed, 28 Jun 2017 18:50:49 +0300 (EEST) Received: by mail-wm0-f66.google.com with SMTP id j85so12302673wmj.0 for ; Wed, 28 Jun 2017 08:50:51 -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=uDvIJqnz8mJ4UTg9rx45BVrAsDlon8Or3JTjdqJvgrs=; b=QjMKW+qJT+xL7fkqTMtH6Xg1QledpolapWSONwskXsbJQa0ZzBDp04WOqfw4Ke68GQ ld1ufQDRtQGWFygWMveGfWxG88LRIVMTKTghd9NLV/2ZPGNMyOOqPVLrV+X/zxWEUgtO 1p08R2dXh4MEIW8v7HJdh+vudUXesZBLcIsxnn5l6Ei307c7TwCohNNAVfHamZtNKBIA 5xMCY8JbNu+lcrunVnQi9OdWGt+fwsMPofaSBLXes5nzK0qIAjMvi7/BMpzOsF28RrWN ThGokb80ENbtBClnynjnpB5xRE27pYPeh2/1OO0JLVG+L1YffKwCQj0ijfqpDB0TaTnF wJ0A== 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=uDvIJqnz8mJ4UTg9rx45BVrAsDlon8Or3JTjdqJvgrs=; b=meRg1szZmsgyRxwVcuXh9gLR7/Bz0XE6+aFWPFrBdbJF/RMjkPYxyZnwZyFxC2FaUt 6KLR7MDh1whpA68XtHHwHcUAsJ66lXRxbh7Hww6zdaO9HaOp1uIkMTFlNwSK9tQN175s 93Oht+MctxFnltv60deQsH9Q8uAF5fpFjZulvI1ULgoLKY65w8xsrZPyBf+GiXEEaw8V HIedvNA/lfFxyMGs6Gd7qqdKMXu1IH2EuNLdRcgRWBcMpn3CtL8fCLZUaJbWVy2EwHCT yTEJED9nikJ5c9AXkOIeULo2hhamGtPfN38roY3I0FP5SONEwveQJs+UgQO+icfxRpmc JhqQ== X-Gm-Message-State: AKS2vOx6k6JXQsTBOdfsGcRAkPBNR24Mp0rqXvZOfcFhjKYPakQRDZ9x UaqVLeiLVjDOc+7gJN4= X-Received: by 10.80.146.232 with SMTP id l37mr8200607eda.160.1498664561958; Wed, 28 Jun 2017 08:42:41 -0700 (PDT) Received: from vimeo-vm.localdomain ([62.208.38.79]) by smtp.gmail.com with ESMTPSA id y53sm1230538edd.4.2017.06.28.08.42.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Jun 2017 08:42:41 -0700 (PDT) From: Derek Buitenhuis To: ffmpeg-devel@ffmpeg.org Date: Wed, 28 Jun 2017 16:42:00 +0100 Message-Id: <1498664522-44645-4-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> Subject: [FFmpeg-devel] [PATCH 3/5] movenc: move tags definitions to where they are used 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" From: John Stebbins (cherry picked from commit 1c64bae648eeb39c8d8a8d81ee142b9eec9fae7b) Signed-off-by: Derek Buitenhuis --- libavformat/movenc.c | 62 ++++++++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 3ca23de..cc6d61d 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1227,17 +1227,6 @@ static int mov_write_dpxe_tag(AVIOContext *pb, MOVTrack *track) return 0; } -static const AVCodecTag codec_ipod_tags[] = { - { AV_CODEC_ID_H264, MKTAG('a','v','c','1') }, - { AV_CODEC_ID_MPEG4, MKTAG('m','p','4','v') }, - { AV_CODEC_ID_AAC, MKTAG('m','p','4','a') }, - { AV_CODEC_ID_ALAC, MKTAG('a','l','a','c') }, - { AV_CODEC_ID_AC3, MKTAG('a','c','-','3') }, - { AV_CODEC_ID_MOV_TEXT, MKTAG('t','x','3','g') }, - { AV_CODEC_ID_MOV_TEXT, MKTAG('t','e','x','t') }, - { AV_CODEC_ID_NONE, 0 }, -}; - static int mov_get_dv_codec_tag(AVFormatContext *s, MOVTrack *track) { int tag; @@ -1514,26 +1503,6 @@ static int mov_get_codec_tag(AVFormatContext *s, MOVTrack *track) return tag; } -static const AVCodecTag codec_3gp_tags[] = { - { AV_CODEC_ID_H263, MKTAG('s','2','6','3') }, - { AV_CODEC_ID_H264, MKTAG('a','v','c','1') }, - { AV_CODEC_ID_MPEG4, MKTAG('m','p','4','v') }, - { AV_CODEC_ID_AAC, MKTAG('m','p','4','a') }, - { AV_CODEC_ID_AMR_NB, MKTAG('s','a','m','r') }, - { AV_CODEC_ID_AMR_WB, MKTAG('s','a','w','b') }, - { AV_CODEC_ID_MOV_TEXT, MKTAG('t','x','3','g') }, - { AV_CODEC_ID_NONE, 0 }, -}; - -static const AVCodecTag codec_f4v_tags[] = { // XXX: add GIF/PNG/JPEG? - { AV_CODEC_ID_MP3, MKTAG('.','m','p','3') }, - { AV_CODEC_ID_AAC, MKTAG('m','p','4','a') }, - { AV_CODEC_ID_H264, MKTAG('a','v','c','1') }, - { AV_CODEC_ID_VP6A, MKTAG('V','P','6','A') }, - { AV_CODEC_ID_VP6F, MKTAG('V','P','6','F') }, - { AV_CODEC_ID_NONE, 0 }, -}; - static int mov_find_codec_tag(AVFormatContext *s, MOVTrack *track) { int tag; @@ -6450,6 +6419,17 @@ static int mov_check_bitstream(struct AVFormatContext *s, const AVPacket *pkt) return ret; } +static const AVCodecTag codec_3gp_tags[] = { + { AV_CODEC_ID_H263, MKTAG('s','2','6','3') }, + { AV_CODEC_ID_H264, MKTAG('a','v','c','1') }, + { AV_CODEC_ID_MPEG4, MKTAG('m','p','4','v') }, + { AV_CODEC_ID_AAC, MKTAG('m','p','4','a') }, + { AV_CODEC_ID_AMR_NB, MKTAG('s','a','m','r') }, + { AV_CODEC_ID_AMR_WB, MKTAG('s','a','w','b') }, + { AV_CODEC_ID_MOV_TEXT, MKTAG('t','x','3','g') }, + { AV_CODEC_ID_NONE, 0 }, +}; + const AVCodecTag codec_mp4_tags[] = { { AV_CODEC_ID_MPEG4 , MKTAG('m', 'p', '4', 'v') }, { AV_CODEC_ID_H264 , MKTAG('a', 'v', 'c', '1') }, @@ -6485,6 +6465,26 @@ const AVCodecTag codec_ism_tags[] = { { AV_CODEC_ID_NONE , 0 }, }; +static const AVCodecTag codec_ipod_tags[] = { + { AV_CODEC_ID_H264, MKTAG('a','v','c','1') }, + { AV_CODEC_ID_MPEG4, MKTAG('m','p','4','v') }, + { AV_CODEC_ID_AAC, MKTAG('m','p','4','a') }, + { AV_CODEC_ID_ALAC, MKTAG('a','l','a','c') }, + { AV_CODEC_ID_AC3, MKTAG('a','c','-','3') }, + { AV_CODEC_ID_MOV_TEXT, MKTAG('t','x','3','g') }, + { AV_CODEC_ID_MOV_TEXT, MKTAG('t','e','x','t') }, + { AV_CODEC_ID_NONE, 0 }, +}; + +static const AVCodecTag codec_f4v_tags[] = { + { AV_CODEC_ID_MP3, MKTAG('.','m','p','3') }, + { AV_CODEC_ID_AAC, MKTAG('m','p','4','a') }, + { AV_CODEC_ID_H264, MKTAG('a','v','c','1') }, + { AV_CODEC_ID_VP6A, MKTAG('V','P','6','A') }, + { AV_CODEC_ID_VP6F, MKTAG('V','P','6','F') }, + { AV_CODEC_ID_NONE, 0 }, +}; + #if CONFIG_MOV_MUXER MOV_CLASS(mov) AVOutputFormat ff_mov_muxer = {