From patchwork Wed Aug 3 21:31:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Reid X-Patchwork-Id: 84 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.67 with SMTP id o64csp896771vsd; Wed, 3 Aug 2016 14:37:32 -0700 (PDT) X-Received: by 10.194.166.37 with SMTP id zd5mr62714433wjb.170.1470260252409; Wed, 03 Aug 2016 14:37:32 -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 g202si374534wmg.75.2016.08.03.14.37.31; Wed, 03 Aug 2016 14:37:32 -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 67A7268A2DD; Thu, 4 Aug 2016 00:37:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pa0-f66.google.com (mail-pa0-f66.google.com [209.85.220.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7247668A0C2 for ; Thu, 4 Aug 2016 00:31:05 +0300 (EEST) Received: by mail-pa0-f66.google.com with SMTP id q2so14672316pap.0 for ; Wed, 03 Aug 2016 14:31:12 -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; bh=o5ASUV2168IiUFOC4qryZGZ0Us9saX/7/bSGHY6kwA8=; b=VeX0F9Sz6yrg1m5VnPVefB7ecAslWCRxN0rLjeGnYoRUdTqWG4Uc2gdopbDXLmH2my TobZrS6WL43QKoYhUYX9mNYUM0yLmMQDSOVk6t2CM2dZd30DFHYnXHpmLNQHJoMgmb4F GxepqIE8D6KZnRHunXgIyrQ+z9r7Z+rY6hbzAbRxikQDGW6uQboaJFeWB3LUg6i1JjNT MJwEShcoXt0pMr85lfwSgppj3y8/waUyTFARycDjYg0XvdlUgh3g2xFP5oV63L5D9xMW C7G1ZmOUqIGvxOpe0EO0XG6bzO2oN5gd1ozIg+KYNo6NRMFtU5hTrQYin6DZX0nD4Arj KFAw== 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; bh=o5ASUV2168IiUFOC4qryZGZ0Us9saX/7/bSGHY6kwA8=; b=UaQGeQkRWsesvR35deAp1OuuMnfQJFE+9uZv8CcTENV9gIXtvdN90p1Nhlyu6+Tv2I AvorDS1m9OUWGzlUEaQ57dKFvV4/j609PobmBWHXKtTe2lWE50T8m1Mgym6U2LcD5aUD 9i+ocNn1Ew7eAOf0EJRiRtrBKauIkDImX8W2+Xq2+L0DsfTn+g0wK2mhCFQKaz/IYzfX r2iPq23ryI8JIBezVOYbbE/YCzEZOblnxT41qE503B/nVibyLEKnvMJ9uPMHC+yNWCX9 E4P/hSDCdtbYnmAjqblBJn1o9YddiKtE61Q5um0v+VR4i8YyDK0Kdx7/q+ZL+h18chPS iK/Q== X-Gm-Message-State: AEkoous84xfAAc7B/VdxAEQIfmEZLklLJh9ZDZN8dYmVB8UMvTvwPK+oNFuzb3/JE01P8g== X-Received: by 10.66.147.234 with SMTP id tn10mr95338953pab.144.1470259870116; Wed, 03 Aug 2016 14:31:10 -0700 (PDT) Received: from localhost.localdomain (S0106ac228b6e4f8e.vc.shawcable.net. [24.86.211.88]) by smtp.gmail.com with ESMTPSA id bw10sm14867709pac.27.2016.08.03.14.31.09 (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 03 Aug 2016 14:31:09 -0700 (PDT) From: Mark Reid To: ffmpeg-devel@ffmpeg.org Date: Wed, 3 Aug 2016 14:31:04 -0700 Message-Id: <20160803213104.4792-1-mindmark@gmail.com> X-Mailer: git-send-email 2.9.2 Subject: [FFmpeg-devel] [PATCH] libavcodec/dnxhdenc: remove setting the 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 Cc: Mark Reid MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" setting the codec_tag no longer needed by movenc it uses the dnxhr profile instead --- libavcodec/dnxhdenc.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index b0ee8a2..cbf4cd5 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -341,9 +341,6 @@ static av_cold int dnxhd_encode_init(AVCodecContext *avctx) } av_log(avctx, AV_LOG_DEBUG, "cid %d\n", ctx->cid); - if (ctx->cid >= 1270 && ctx->cid <= 1274) - avctx->codec_tag = MKTAG('A','V','d','h'); - if (avctx->width < 256 || avctx->height < 120) { av_log(avctx, AV_LOG_ERROR, "Input dimensions too small, input must be at least 256x120\n");