From patchwork Mon Apr 3 20:13:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rostislav Pehlivanov X-Patchwork-Id: 3274 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.44.195 with SMTP id s186csp240215vss; Mon, 3 Apr 2017 13:20:03 -0700 (PDT) X-Received: by 10.223.150.81 with SMTP id c17mr17041258wra.85.1491250803636; Mon, 03 Apr 2017 13:20:03 -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 j2si10123198wrj.331.2017.04.03.13.20.02; Mon, 03 Apr 2017 13:20:03 -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 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 30971680D1D; Mon, 3 Apr 2017 23:19:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 49E95680ADA for ; Mon, 3 Apr 2017 23:19:51 +0300 (EEST) Received: by mail-wr0-f193.google.com with SMTP id k6so35278548wre.3 for ; Mon, 03 Apr 2017 13:19:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=jeL3gcLnCf4pIJI6MY+cKNiN0adXnxE/1x6j+dXBM6g=; b=OpNFDdIuDhfhcnEAZ5lVN2nBAfqWJQ0RxRy4pOORP466HBPQZF8Z7tSDA7A+N9EJKx p4Kn9+OqCyB54A9JSQjK9XhCZAM3ggp3ffSNU+aWlWsfIs549G2aqRI5RjNdwa3uXcIU hDCVwwr4TP3JiVoii11DeGDeonbdROKvkfcPOEwJwX5WLegVhp4QrDxktj9w2FMWgvTd ZemwNw/IyboABMTPpos8S4SVQ85s2dQGd/M6E8hzL8V2dR5nJJD8kxQeG2wW3RzhqeM7 V4hVSxO8HcMl05VsoZlLMyuteukKPhFxXqdBRi7Xbn/r29RS+3ujLQf4cAaa+YqPE6u+ ai/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=jeL3gcLnCf4pIJI6MY+cKNiN0adXnxE/1x6j+dXBM6g=; b=FcLDFQs5K0AunU3nb2e+3zt61gusZ4bi85FprapfOA/1fVoqV2jsVjrRnUpm5Ysgz1 xO+k/zIlMse9OHLbrvM5egvYq5HecIpKwV5+OlKNaT63Z0VSu5svOP9rVPGCkHvJ8xbI nBMY6E87QvisTh4sIW3krYbVs/Hh2MXtuT+w6OKo24ZnG8T4vl/DtUDfee0wli2+ucQL nX6H6EzWvUVfd90T0idvQ4/+l4ftz67au3zan/EdgxXosKkibSZVPjXuk/JRzq49Zehx dgUWYW8nRSRknNQmFHiAFMkQ2cKw00r6zGzV4UVBgOqriV6stF7L/zJ9rWmjoVgB2nH6 W71g== X-Gm-Message-State: AFeK/H2iWbYsgBIWyEHN3gum78eR2ToZPdxFJ6rebAdDapt4gkipbfCTrPvndJaZm0OjDg== X-Received: by 10.28.64.135 with SMTP id n129mr5728252wma.45.1491250419099; Mon, 03 Apr 2017 13:13:39 -0700 (PDT) Received: from moonbase.lan (host86-136-239-66.range86-136.btcentralplus.com. [86.136.239.66]) by smtp.gmail.com with ESMTPSA id 201sm15651802wmr.5.2017.04.03.13.13.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Apr 2017 13:13:38 -0700 (PDT) From: Rostislav Pehlivanov To: ffmpeg-devel@ffmpeg.org Date: Mon, 3 Apr 2017 21:13:29 +0100 Message-Id: <20170403201330.44240-2-atomnuker@gmail.com> X-Mailer: git-send-email 2.12.2.564.g063fe858b8 In-Reply-To: <20170403201330.44240-1-atomnuker@gmail.com> References: <20170403201330.44240-1-atomnuker@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/3] mjpegenc: disable huffman coding with AMV 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: Rostislav Pehlivanov MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Isn't supported. Signed-off-by: Rostislav Pehlivanov --- libavcodec/mpegvideo_enc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 71a858fc72..8cc964be23 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -399,6 +399,11 @@ FF_ENABLE_DEPRECATION_WARNINGS return AVERROR(EINVAL); } + if (s->huffman && avctx->codec_id == AV_CODEC_ID_AMV) { + av_log(avctx, AV_LOG_WARNING, "AMV doesn't support optimized huffman tables, disabling\n"); + s->huffman = 0; + } + if (s->intra_dc_precision > (avctx->codec_id == AV_CODEC_ID_MPEG2VIDEO ? 3 : 0)) { av_log(avctx, AV_LOG_ERROR, "intra dc precision too large\n"); return AVERROR(EINVAL);