From patchwork Sat Aug 17 03:12:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 14562 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 0CAD244A31F for ; Sat, 17 Aug 2019 06:13:34 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D649A68AC1E; Sat, 17 Aug 2019 06:13:33 +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 599FB68ABD9 for ; Sat, 17 Aug 2019 06:13:27 +0300 (EEST) Received: by mail-wm1-f65.google.com with SMTP id e8so4351575wme.1 for ; Fri, 16 Aug 2019 20:13:27 -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=sDv9SPO1NYdpMXMIkE1p5rRY3RCSB/eo4dZd6exOw3Y=; b=u4rrV14t2IaOvsV8x8eByUmZggfZmlUlCEAhvjyFcK9ZnTDkcHJ49q1x8WDnnmcUi1 51MP6tYt5cVZe8vuPRu31tUfXS3oz4ifqXip68uVMk4SRQMrENsRqgIrVKccrDrOQfY+ irUn3rCaN4dssj9vdqIUsppdHJgYn8sisCVgKbhLBlAtyjFpUWBF92OJl6GSqM/XmK56 oyce6x8WSOe3xh3McrlU90TfsA5gSpMy1DRqIEjeZTgYlzc29IQK/5Z/7xdgvpVqoLy5 jYwLwj7ik8NZzysBb//1KVkmMe4RTbbikru67cG6kSvxDebi7oo/CsNJXtlXXEecoJCq 6moA== 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=sDv9SPO1NYdpMXMIkE1p5rRY3RCSB/eo4dZd6exOw3Y=; b=sSf+hWNyg0QgvU6W96oFGJTqyyVbuIJB0n9gkOHLRGl4PIKQ1JtdUEJ6amGzRoGsJY FpYpRLmAYRnj6fmPDnnJ2gqdCbUyyvOaTsgZ1LBVVqKiyPH1FGzNR5a3C8FLQSuP9W6I Tmo5jlwRqSNwQs/XHnfncFvA2ELYTNpGDT2xZA/GtMRsxUhmrdl7/jRidCjIL3uhqTh2 lxzy7H+JX5u6ANrwfIYgNeOzEvxKfRD/4mJFEDQyDGEZlh3JNkVyxSqmqagE8Yj9htBS hT9ntNe1MAJe/WnRg6XLtuxXByVlWW8jU2m0EKKH8RxjYBGGMo5NNIiZWDjtJs+VU3gX E3kg== X-Gm-Message-State: APjAAAWAn1IKVG0A6iM1JNxlVQGQJbnT9pRlHfZtagq+DzELZxs6aiGP +1S3A5a5ObR/1Ek5yMUE5W3yKMQf X-Google-Smtp-Source: APXvYqx5O0JtxuzoZTlDeqKsvurxlgtvHn/ifBHitHfNMONE/LOURs/xxNRsSnTJfUeJeagbI8A3AQ== X-Received: by 2002:a1c:7009:: with SMTP id l9mr9612200wmc.159.1566011606668; Fri, 16 Aug 2019 20:13:26 -0700 (PDT) Received: from localhost.localdomain (ipbcc08b69.dynamic.kabel-deutschland.de. [188.192.139.105]) by smtp.gmail.com with ESMTPSA id w13sm16306938wre.44.2019.08.16.20.13.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Aug 2019 20:13:25 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 17 Aug 2019 05:12:45 +0200 Message-Id: <20190817031245.62257-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190813024726.6596-8-andreas.rheinhardt@gmail.com> References: <20190813024726.6596-8-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/avformat.h: Correct some comments 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" 1. When set_parameters was removed from AVOutputFormat in 2fb75019, it was forgotten to remove the comment pertaining to it. Said comment now appeared to apply to interleave_packet; it is of course nonsense and has been replaced by an accurate description. 2. The description of av_write_uncoded_frame suggested av_interleaved_write_frame as a replacement if the input is not already correctly interleaved; it also referred to said function for details. Given that said function can't write AVFrames and that the stuff specific to writing uncoded frames is explained in the description of av_interleaved_write_uncoded_frame, both references have been fixed. 3. Removed an outdated comment about avformat_seek_file. Signed-off-by: Andreas Rheinhardt --- Now without version bump. libavformat/avformat.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 6eb329f13f..92c3a89f4b 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -556,7 +556,8 @@ typedef struct AVOutputFormat { int (*write_packet)(struct AVFormatContext *, AVPacket *pkt); int (*write_trailer)(struct AVFormatContext *); /** - * Currently only used to set pixel format if not YUV420P. + * A format-specific function for interleavement. + * If unset, packets will be interleaved by dts. */ int (*interleave_packet)(struct AVFormatContext *, AVPacket *out, AVPacket *in, int flush); @@ -2449,8 +2450,6 @@ int av_seek_frame(AVFormatContext *s, int stream_index, int64_t timestamp, * @return >=0 on success, error code otherwise * * @note This is part of the new seek API which is still under construction. - * Thus do not use this yet. It may change at any time, do not expect - * ABI compatibility yet! */ int avformat_seek_file(AVFormatContext *s, int stream_index, int64_t min_ts, int64_t ts, int64_t max_ts, int flags); @@ -2637,9 +2636,9 @@ int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt); * Write an uncoded frame to an output media file. * * The frame must be correctly interleaved according to the container - * specification; if not, then av_interleaved_write_frame() must be used. + * specification; if not, av_interleaved_write_uncoded_frame() must be used. * - * See av_interleaved_write_frame() for details. + * See av_interleaved_write_uncoded_frame() for details. */ int av_write_uncoded_frame(AVFormatContext *s, int stream_index, AVFrame *frame);