From patchwork Mon Nov 5 17:26:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vittorio Giovara X-Patchwork-Id: 10940 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 77B2944CA2F for ; Mon, 5 Nov 2018 19:33:29 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E159C68A882; Mon, 5 Nov 2018 19:33:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vs1-f65.google.com (mail-vs1-f65.google.com [209.85.217.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 315D468A844 for ; Mon, 5 Nov 2018 19:32:55 +0200 (EET) Received: by mail-vs1-f65.google.com with SMTP id s9so5593438vsk.7 for ; Mon, 05 Nov 2018 09:33:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=us/rcL9RWDtLUj1+UW8kAJj/8+miD4hocS0VM9Gv6H0=; b=Fd8ElajjXYKlJzu3b7ekxk+YW1ycnkY2l5Hfvn29e9d9rXd2tRCpFWbtK2fO5YlB85 xsSb2oudCAT90HVKR21iL1CjhVMKyG4tnzkFK7NzGyPEkRez5rEJ5DLrPFOMJzfG0hrL tZ5VC5ejw+j+VOAlIF507wIQ8ZXg7ky/AZMkWTytKzdqpXNkCslpN/f9m+kK5KqrtsvP F1w2ap/hAhuY00LxrJHbVVjDWcRZ9EoyHJ4iJ6eFgElzjJBxz8+rXjYg9sDwgK/RY8BI fKCBN7tTT/sc8FU/Vn67v2D2AEiFBUqbqyMflZwEmdLFeCu7fILgT5v72nHkRF4mTyUw aQUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=us/rcL9RWDtLUj1+UW8kAJj/8+miD4hocS0VM9Gv6H0=; b=CIXp9wnJy4mf1DjVArx5VKHQrICrew8TfloevHjyctYDMCj0NTRD0wOknRaWRkJyh7 Yli6B4YRfnRf9w55nJLZ6o289mJ4lwAqC7LtlTWSrK4HHCQnnjJrJPsOgEXu+iVf5Cxk OQVnQ1JadHcyyuwbf5iovYREtQxGkwwFRsBU4zTRLNXk/dy3kO9I2cxbm2jLbjlLTUoL jI1LyojmaDoe2FmCyA0JZEzXeVJ6LgbZxRfWhT3uK8a09ivScAsOB19H0UcefWbZSZFR NCAp6x72/a9TJpBRfUmGao9v65UiNGm3Yj5JDo4Odg4ksb2+lGgv0aRpo1R/gQfMk/go spqQ== X-Gm-Message-State: AGRZ1gKSmmafL58RkMkuigCHcLQBZq93X1/vEDagt68u2V+2H3JuZjpS AOzV76T9g3G31AXgRLQLbiTCBzZ6Wns7DvQk+qt/Chy0 X-Google-Smtp-Source: AJdET5e20i/QVxPAa35uKNnBHRJyu2boLBe19Tj3qyjHrSema8Z/O4z3DIU9PuHjjdrZ0I7LRmOFIsqprUthpmeTOeo= X-Received: by 2002:a67:8cc8:: with SMTP id o191mr1946711vsd.55.1541438786023; Mon, 05 Nov 2018 09:26:26 -0800 (PST) MIME-Version: 1.0 References: <20181102193540.64694-1-vittorio.giovara@gmail.com> <20181102193540.64694-4-vittorio.giovara@gmail.com> In-Reply-To: From: Vittorio Giovara Date: Mon, 5 Nov 2018 12:26:14 -0500 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: Re: [FFmpeg-devel] [PATCH 4/4] mjpeg: Use profile names in the encoder and decoder 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" On Fri, Nov 2, 2018 at 5:29 PM Carl Eugen Hoyos wrote: > 2018-11-02 20:35 GMT+01:00, Vittorio Giovara : > > --- > > libavcodec/codec_desc.c | 1 + > > libavcodec/mjpegdec.c | 2 ++ > > libavcodec/profiles.c | 9 +++++++++ > > libavcodec/profiles.h | 1 + > > libavcodec/version.h | 2 +- > > 5 files changed, 14 insertions(+), 1 deletion(-) > > How does this patch affect the encoder? > sorry forgot to fold in these changes diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index d2fcb8e191..0ea7bd3d10 100644 --- a/libavcodec/mjpegenc.c +++ b/libavcodec/mjpegenc.c @@ -38,6 +38,7 @@ #include "mpegvideo.h" #include "mjpeg.h" #include "mjpegenc.h" +#include "profiles.h" static int alloc_huffman(MpegEncContext *s) { @@ -418,6 +419,7 @@ AVCodec ff_mjpeg_encoder = { AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_NONE }, .priv_class = &mjpeg_class, + .profiles = NULL_IF_CONFIG_SMALL(ff_mjpeg_profiles), }; #endif