From patchwork Fri Sep 9 15:11:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Converse X-Patchwork-Id: 495 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp373213vsd; Fri, 9 Sep 2016 08:12:25 -0700 (PDT) X-Received: by 10.28.97.2 with SMTP id v2mr3371121wmb.31.1473433945517; Fri, 09 Sep 2016 08:12:25 -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 al10si3361834wjc.183.2016.09.09.08.12.23; Fri, 09 Sep 2016 08:12:25 -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 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 32D74689BBA; Fri, 9 Sep 2016 18:12:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B2675680193 for ; Fri, 9 Sep 2016 18:12:04 +0300 (EEST) Received: by mail-pf0-f194.google.com with SMTP id n24so4150870pfb.2 for ; Fri, 09 Sep 2016 08:12:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=oUa9U2IbEmaKFIEhobP1BuiN9kn0pmrj/5XHd4ipOnM=; b=AIVjGuWl6YrwMVqfFqIsrpBM/g/LBXczm7w5qSkgWBhWY8mu3s28xS8F4KOfwJm6Zo AdNt0RuAB/gd6Kywe9kt59e1TZNpgJ76AxQ/jsKIHJ4ucCK8x/oVnb/Y00lmr7jTIsEo 9ASDzqatC0Sung++L2chrYbvXqy0U83wFllydNkY1eHR+f3U7fzys6x2UOrfvhGDq2P5 iS/9VGgawy4DR3H+VlgElg8vj/VKeLtVbNi4djFZlFKGwvmpMw7xg1f9u1+gDhBLLvIb 7ZPJq4+/INeLz6tVnTVUQbMAoryMK1uUAUupssa2zo3ywuGKYd1Wi3hjSXRi/aHwSUZ3 NDpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=oUa9U2IbEmaKFIEhobP1BuiN9kn0pmrj/5XHd4ipOnM=; b=U3Ihqu+uBC/sTlN6o5SEzMrC03txlzlgPsgQOkVth1TCYM7mssHVNJGNVf06TmI9B6 uLCf25lSOUStlQ4TEkZVFOupZQRrOBJH2OG0hBqubH2k3OBNMc3LpdJIy7XDgjdoVKHW GX1vSy93W0D0VADAR2D4rlELRDSOrrGHnA4Hk1QdI9ZnjwKr3b4gikd/hquCK34jviUe QQ71up+wuV/Nn+E2ZyF92LL+Ub3FZkaRX5GAzVgXhC+B2FRMHQiqvfxPTr5jX6TFD/N5 wa9oeM7q34gGFN5YXhuRGgPiWq2YA1BwN9uN8KZee6E/nMUnqctxsdQOjwN7oh8CtOZm tztQ== X-Gm-Message-State: AE9vXwM1X2Ga4pgetjo3Md4DARumSyjLS07nTeV7ggm7+8bIxfFs+vuTLLXULawzPvcoYQ== X-Received: by 10.98.51.131 with SMTP id z125mr7455099pfz.109.1473433933803; Fri, 09 Sep 2016 08:12:13 -0700 (PDT) Received: from terok.mtv.corp.google.com ([172.22.116.121]) by smtp.gmail.com with ESMTPSA id v124sm6129690pfb.14.2016.09.09.08.12.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 09 Sep 2016 08:12:12 -0700 (PDT) From: Alex Converse To: ffmpeg-devel@ffmpeg.org Date: Fri, 9 Sep 2016 08:11:07 -0700 Message-Id: <1473433867-7323-1-git-send-email-alex.converse@gmail.com> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1473378063-964-2-git-send-email-alex.converse@gmail.com> References: <1473378063-964-2-git-send-email-alex.converse@gmail.com> Subject: [FFmpeg-devel] [PATCH] ivfenc: Add VPX codec tags. 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 Cc: Alex Converse MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This fixes remuxing VPX from MP4 without manually overwriting the tag. --- libavformat/ivfenc.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavformat/ivfenc.c b/libavformat/ivfenc.c index 5dbcd97..f3ae4dc 100644 --- a/libavformat/ivfenc.c +++ b/libavformat/ivfenc.c @@ -97,6 +97,12 @@ static int ivf_check_bitstream(struct AVFormatContext *s, const AVPacket *pkt) return ret; } +static const AVCodecTag codec_ivf_tags[] = { + { AV_CODEC_ID_VP8, MKTAG('V', 'P', '8', '0') }, + { AV_CODEC_ID_VP9, MKTAG('V', 'P', '9', '0') }, + { AV_CODEC_ID_NONE, 0 } +}; + AVOutputFormat ff_ivf_muxer = { .priv_data_size = sizeof(IVFEncContext), .name = "ivf", @@ -108,4 +114,5 @@ AVOutputFormat ff_ivf_muxer = { .write_packet = ivf_write_packet, .write_trailer = ivf_write_trailer, .check_bitstream = ivf_check_bitstream, + .codec_tag = (const AVCodecTag* const []){ codec_ivf_tags, 0 }, };