From patchwork Tue Mar 31 12:37:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18536 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 8C0EE44B734 for ; Tue, 31 Mar 2020 15:44:57 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 71DA968B149; Tue, 31 Mar 2020 15:44:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6354668AF8C for ; Tue, 31 Mar 2020 15:44:51 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id z7so345447wmk.1 for ; Tue, 31 Mar 2020 05:44:51 -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=3En9AlFMLFS9kfDm6Xbg1TwhUMSdfyiSVO7rg8J4VDE=; b=urWWReelx+isQzBd/j3YO2Lqf5k4uQUX3nQEJIBRWLaqPSCSPstKq/ver3FFKD9WwJ bt11sFGs/WegrxMqkYRf5oyTVZ0bAVdIwP18hqWci9T+F7K4bCrs56jtdJCh2tadvNsh E14mRlmanNjwRGQ6wKyNghGX1YF7FpD2tHX2q+I1EyLRMXg9s7Z5kgqQnjFEro1eVrBp OgrV8rEHFk8SYk7mNI/4NLjs7q/io4N0NY75MjBigV1hjz89auryM5DEpYXnrWnJmbad rem8Zr3cH6kQHKfG90BbChcLr6nsWbMesnzmFR/7+RoyZB5SCDQRG2HLcht7J+WGSMss XnWA== 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=3En9AlFMLFS9kfDm6Xbg1TwhUMSdfyiSVO7rg8J4VDE=; b=qkLCVpfpdejdDwOVNr5l/CXk8ObPxFV04BzWnoX1Arq4HEblMq/gAvfToueGXU+LP9 UuZ4Sl9zu+9yEf3REbbTTfmWKdvHJGAjk5YmmGAp+shohy/de763ytcX6qOxPc7CTaDH HguyuEhHALMofgYfdroW3cVApGSMoyZPEh5qvUmrIfadTGBsAoswQAoy1mQMwvvWrGr4 p00KzAW1x3ZezDlAIesIPodOW8DAirDbmkiDmWkZgoTlDcHDL2t0tTNIVFV8UW1om1Pc MX0dlpOsQlvIdUOghGVE4gyYmfkVo09fnQ6kBF6Klpp2iOuUy2VmoExSiIMob1yp5l0r BIaA== X-Gm-Message-State: ANhLgQ0q8ovQXON3B9CaWTfb81COlp4rm27d3drU1wExZPUTaFv8qxxv TAvOtxql9riihAIUxm9gNEEvIjPa X-Google-Smtp-Source: ADFU+vuUhHxOA/iHtv9sbXl1pIDOxQzDX+vus6O08tJYxqDzuLyXEOzn5emCew3TNeXDC8tVCzuPhg== X-Received: by 2002:a1c:7301:: with SMTP id d1mr3464255wmb.26.1585658309599; Tue, 31 Mar 2020 05:38:29 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id p13sm26301532wru.3.2020.03.31.05.38.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Mar 2020 05:38:29 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 31 Mar 2020 14:37:38 +0200 Message-Id: <20200331123745.6461-4-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200331123745.6461-1-andreas.rheinhardt@gmail.com> References: <20200331123745.6461-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 03/10] 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 specifics of writing uncoded frames are 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 --- libavformat/avformat.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index e906d7b7e9..39b99b4481 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -551,7 +551,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); @@ -2453,8 +2454,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); @@ -2641,9 +2640,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);