From patchwork Tue Jun 4 13:41:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 13411 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 A1FCA445EBD for ; Tue, 4 Jun 2019 16:47:39 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8717868A451; Tue, 4 Jun 2019 16:47:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2B8A5689ED4 for ; Tue, 4 Jun 2019 16:47:32 +0300 (EEST) Received: by mail-wm1-f65.google.com with SMTP id c6so151680wml.0 for ; Tue, 04 Jun 2019 06:47:32 -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 :mime-version:content-transfer-encoding; bh=rJj5i+z6nJ1eM5QzRCEPUCZTGiB0zx857qEf6L69bLQ=; b=lxBsGAF3rCrlmjl5JcgTpYBFoNQgBAFtHwk7Fhlt7BqStlwLrTqLVAZvrzb/EDVrbr U0oz00Z0HL3a+lsCOz3tiZNJHRRChjwm+MbdG/mjSCrDeMApZ10w0pIRij2hIyE4cI/d DE0FtTEUaF2PsfVGMB/gBoisTqSeB3P0kVzybCWKtBweV15TkUpG2Y3JN4nvheA7uRdm R9v+XmlODtonZEdvCznzs3txJtQKaTptCVcOS9xCArDb6ZinlkROMV168EL+6vXKyLat L4tNOkzO29A1SxbDhMM2+xoKPfU+Sm5U80vMQOWviKrkSQNjf7j//gAAUqaWanA9LwDX aNjA== 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:mime-version:content-transfer-encoding; bh=rJj5i+z6nJ1eM5QzRCEPUCZTGiB0zx857qEf6L69bLQ=; b=knFcDEq28ybNjLFAKJUPjKCryJ74vp6IMpa8cocD6rd3JGn0iDGffA2qrgM8pqTC2c 2L7sVFOo1i8Fscx1ulhxt0iaFiSumLCVte48RNpE2xGRoMJxNNoqdJLuSLI+pJsW2fnp 18lvAIdVMXpznpIMEfQwOpXsVjQ7KQNlVq+3cXUnwSihcYuoX02xEsmKcuscCwBfDw4N MuTpyOtIT5X5XIX1vsOfy6Wf0e2F8IWJ65xuPDVo2nyEhG2fQz+kLBzlcdimCsQMJOxz +oKb+et83PB8I1+RR6bfN6vQjoLvRvTYvLEYbq/RYC/164xu5Q6VbCjyFZiLe+vSTjbe Rpzw== X-Gm-Message-State: APjAAAWtyd2qHLu03V0IthrcigrIWG1AX0OQhF2188fdS/erkj9p9aaa +J5VyuHWjqUWbITfT3aIBnXh81S2 X-Google-Smtp-Source: APXvYqxEaOFFFUJAoLr2U48WSA8aY9bMPFCjumpR7t978A1K1G6EVj5b2pAr5mkXVC8Q6jePAJxkeA== X-Received: by 2002:a1c:4484:: with SMTP id r126mr18823046wma.27.1559655729565; Tue, 04 Jun 2019 06:42:09 -0700 (PDT) Received: from localhost.localdomain (ipbcc063db.dynamic.kabel-deutschland.de. [188.192.99.219]) by smtp.gmail.com with ESMTPSA id y5sm1878446wrs.63.2019.06.04.06.42.08 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 04 Jun 2019 06:42:08 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 4 Jun 2019 15:41:05 +0200 Message-Id: <20190604134105.23365-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] bitstream_filters: Correct dump_extradata description 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The default is to dump extradata to keyframes, not all frames. Also improve the description of the relevant AVOption. Signed-off-by: Andreas Rheinhardt --- doc/bitstream_filters.texi | 2 +- libavcodec/dump_extradata_bsf.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/bitstream_filters.texi b/doc/bitstream_filters.texi index 25bbf8372b..40e8adad0f 100644 --- a/doc/bitstream_filters.texi +++ b/doc/bitstream_filters.texi @@ -120,7 +120,7 @@ add extradata to all packets @end table @end table -If not specified it is assumed @samp{e}. +If not specified it is assumed @samp{k}. For example the following @command{ffmpeg} command forces a global header (thus disabling individual packet headers) in the H.264 packets diff --git a/libavcodec/dump_extradata_bsf.c b/libavcodec/dump_extradata_bsf.c index 188a1c619b..7112cd6bd4 100644 --- a/libavcodec/dump_extradata_bsf.c +++ b/libavcodec/dump_extradata_bsf.c @@ -81,7 +81,7 @@ fail: #define OFFSET(x) offsetof(DumpExtradataContext, x) #define FLAGS (AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_BSF_PARAM) static const AVOption options[] = { - { "freq", "When do dump extradata", OFFSET(freq), AV_OPT_TYPE_INT, + { "freq", "When to dump extradata", OFFSET(freq), AV_OPT_TYPE_INT, { .i64 = DUMP_FREQ_KEYFRAME }, DUMP_FREQ_KEYFRAME, DUMP_FREQ_ALL, FLAGS, "freq" }, { "k", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = DUMP_FREQ_KEYFRAME }, .flags = FLAGS, .unit = "freq" }, { "keyframe", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = DUMP_FREQ_KEYFRAME }, .flags = FLAGS, .unit = "freq" },