From patchwork Mon Aug 13 13:51:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 9971 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp3177528jad; Mon, 13 Aug 2018 06:52:42 -0700 (PDT) X-Google-Smtp-Source: AA+uWPy5lq7NleONqS89tyQGvSVQ3lllKM1BXhw5JmUtcPg9xerE+JEhJXaWWPbqglwzy9gLNNFZ X-Received: by 2002:adf:9007:: with SMTP id h7-v6mr11380576wrh.178.1534168362114; Mon, 13 Aug 2018 06:52:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534168362; cv=none; d=google.com; s=arc-20160816; b=e7zpoWDTziNjiKo+f2HohM3zKvObw77i6ciLMPPyXPLTwySxHHpQ84/fPhSG+AEhym e3T9mcG9XK7m00+sUid7F+r2h6ZFXKBg58kxTkChogSBkiCsn7DbJ2ZRMGv0Y5/mRnDs kbnrONBcyDDdThxySKF6oOqxWE5edOeMRkV8NxXS9xAPC903gaxw60uvqNbw45B8WeJK OPZLfj71zKeVBo+wscVE6GE/npYPDIYiVdoN0+YPNrMxaCz6WlZGSkRBeGediSWbPWrl LVVSsOKLDb6X7b3qHpW6yHHfIdCeWEQsTVepmZh221b2W+Wtmr/ZcLQ7A08/0xWc3KxP 7dUg== 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:cc: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=LwhXg6fKZGaJ+BmgGwVatPd3RU/bPjdmsE7hBbIXhrQ=; b=wK4luxApvgxc1pEA7VZ0atu9qlYHwV3DHYswyVq4f7CxZp2k0xJYTFgS7kXczcPWpB ky9d7aGxbzxSuU47dPLBkjS91CaD6jSoalXBmRxTeOkR2esDnGr3RCroOV67XVkm056Y YcODZoGvr9asTv8q3NuG5MyeTOt0hNJHL41mtNyusc9uur1GLySdT9LnNs+gXYOTAtPv Ol88/9suVCIj2ri3I79y0UbvJXjC9nklmA6pGSSuGXjLTQGvr+E9WlU7WC9GQHPSygRZ 5JZ80LyLEAIri+tudtpCAhUldM8I8ox5+FL3/69VxDa6xESn/DBrHLWkFEM+45+S6COs WqDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=S+FSlBe8; 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=QUARANTINE 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 z191-v6si7438667wmz.194.2018.08.13.06.52.41; Mon, 13 Aug 2018 06:52:42 -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.s=20161025 header.b=S+FSlBe8; 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=QUARANTINE 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 4E8C968A4AC; Mon, 13 Aug 2018 16:51:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5F92568A431 for ; Mon, 13 Aug 2018 16:51:49 +0300 (EEST) Received: by mail-pg1-f178.google.com with SMTP id w10-v6so7546655pgv.2 for ; Mon, 13 Aug 2018 06:52:12 -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=jk7JWu2mSRsz9a7QTC2FIO53eWRmdjsiARNQevu8S14=; b=S+FSlBe8bM5cDbPZ5rxDiy4iq+bouEXFtjGxqnEhDfHq9drCCnWfW6j0ksz+PXPk8r hJgplpAtCw9L4hw1c+NBcA+qQ6O6p4T9fsDxnrxUu0lKSp7iIiSiF7OzxyEpdJ6FkehV 7JsVEucIpBBdVi6ZS2i3y/AoudxBGkmjI9PCzjRjoyJLQkGv50ERb9bLR8Q4wgdENXSQ 5trASIAWF4a8qkU0ypjB4WpBmtrFrlXoUDeHBoTE2pSPVDv6ttjDzRCcNNQcsiSkBMN+ WLMDmXtLmctK/9jMNWHzHycpb+m8W+EyFNMarlGIJHuzhdxZWtk0W4HYFnZ+FXjD0/yp lxqQ== 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=jk7JWu2mSRsz9a7QTC2FIO53eWRmdjsiARNQevu8S14=; b=ne3MxqT4YVTr0AR9hexJELAP562dZlKIB/60qT3M49Pu/KzNj1JWprF7XnugZmZBGy HxC74SMcfuOHTPZP9MEywAsJjxLNatHIsWDf8e+MCeNA+nxI+wQ3nLOc+rLk38yOuGDM qtZNjXMUZeDCVbqOslkLbXVLDfucdGIKklOh9J/FDTiDSLypUl5wVyp909kDr++Cwa4y I9YJGiBPPkYbpz3EyOXvJgTNRpa8zMQ1o5D4Pa8nJ36clmtDcRz42Ymv/ELoNhK3DeV/ E56n1GPOU8iElrNJWvc0aN24r+VbgUdw0HOUTIpMliFuaIJ9/Xb0XJ5eQYnnsD8yB/dt xzlg== X-Gm-Message-State: AOUpUlFwnWD5bbxfQiQ+uazRQ3sp5ZWA7b1gGU8Tf97y3NuPBLNXMPGL rh88O0fAyehMthzwZyyGsW248kJl76Y= X-Received: by 2002:aa7:860b:: with SMTP id p11-v6mr18933935pfn.247.1534168331101; Mon, 13 Aug 2018 06:52:11 -0700 (PDT) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id e14-v6sm21627460pff.128.2018.08.13.06.52.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Aug 2018 06:52:10 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Aug 2018 21:51:47 +0800 Message-Id: <1534168307-6856-5-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1534168307-6856-1-git-send-email-mypopydev@gmail.com> References: <1534168307-6856-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH 4/4] lavc/mpeg4videodec: fix can't dump AVOptions issue. 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" fix can't dump the mpeg4videodec option with the command "ffmpeg -h decoder=mpeg4". Signed-off-by: Jun Zhao --- libavcodec/mpeg4videodec.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 24c280d..549b7a5 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -3435,9 +3435,10 @@ static av_cold int decode_end(AVCodecContext *avctx) return ff_h263_decode_end(avctx); } +#define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM static const AVOption mpeg4_options[] = { - {"quarter_sample", "1/4 subpel MC", offsetof(MpegEncContext, quarter_sample), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, 0}, - {"divx_packed", "divx style packed b frames", offsetof(MpegEncContext, divx_packed), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, 0}, + {"quarter_sample", "1/4 subpel MC", offsetof(MpegEncContext, quarter_sample), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, VD}, + {"divx_packed", "divx style packed b frames", offsetof(MpegEncContext, divx_packed), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, VD}, {NULL} };