From patchwork Tue Aug 13 02:47:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 14465 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 39765447E79 for ; Tue, 13 Aug 2019 05:48:58 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2182C68ABA6; Tue, 13 Aug 2019 05:48:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 142A568AC05 for ; Tue, 13 Aug 2019 05:48:50 +0300 (EEST) Received: by mail-wr1-f46.google.com with SMTP id k2so20484797wrq.2 for ; Mon, 12 Aug 2019 19:48:50 -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=5oYG/C6SICMpOJu/isugmGFmcgzgYlCefM4/MylDjmI=; b=FVSt0ItWB59fRjBEuih03jqsMJaeA3v85tUr49JrOoi7yq/ZLjYr3nglyRjl4dCEAh ANiBWXFwDLNGbZf/izGsX1pJxZs/Lj2cmAjAXrC4OigoEjNHgLnC2phV28PEKIyUu1Fz dLbwJ9ICuPi2aWfksUhGL9+ZmrDEoiCbBykrYBnGVncjxb13nVolg0z0FnYsOwdgXmIQ O2pH1JthF1BzxFOAqfDwWx9/cgFr8D/p57gNgrwUGBK7/LbcJa0ytk8jya6Hizk7iLlg sROBRsY7/BtVh0BeHFRrcIARNcOk2U/2FbWNACokvf8B/jyotKd7/ieatP8ptt/8fbnR MqGg== 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=5oYG/C6SICMpOJu/isugmGFmcgzgYlCefM4/MylDjmI=; b=s4U1jiC2b1ug3WN6+8FO80s8waupuispCcjQ3535NLzHl86AnmishfyhvzOh3wwL0Q 6qMlgm/QNLl2OSiJYZubdCT/V28pwus3a0WK2ftkhJdgm+uvqZxmWSOq47U5ZDiS7pEJ klPd30J3cZLGbSI+UuafBzy2dwdGoGyJRuypZU9WiAlV5u/8HJHiWkHsAU+pFhKYP5bM yH+33PsagskpI+lZLtsqwhyemM6X7f/Bv60WEH0ZY/Mq632pYnu4J2nVnzzzb7HR9T0w 3+2OTp2ahmdV2mh7ayKc8byr2W9hwgl4gBorc7tPEso5bRphV0cuk3FYLwAVLBspa6mT Z5Dw== X-Gm-Message-State: APjAAAU21QH2LFz/8tpwb5nfSwkB6q39ZUKSuiJ1yaj+IhYIZNdC0Pge PTAid2Zcuor7dCczxaWrEFHQNyJo X-Google-Smtp-Source: APXvYqy8D4jLIQ8ZfbYls7LuGvYkxuehdSYyw4Zo5ly8jdlmDCfEVwPZucMPfN/UAeGIdeNgjmK/jw== X-Received: by 2002:a05:6000:42:: with SMTP id k2mr42001380wrx.80.1565664529344; Mon, 12 Aug 2019 19:48:49 -0700 (PDT) Received: from localhost.localdomain (ipbcc06ceb.dynamic.kabel-deutschland.de. [188.192.108.235]) by smtp.gmail.com with ESMTPSA id k13sm25020613wro.97.2019.08.12.19.48.48 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 12 Aug 2019 19:48:48 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 13 Aug 2019 04:47:21 +0200 Message-Id: <20190813024726.6596-8-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190813024726.6596-1-andreas.rheinhardt@gmail.com> References: <20190813024726.6596-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 08/13] 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 --- libavformat/avformat.h | 9 ++++----- libavformat/version.h | 2 +- 2 files changed, 5 insertions(+), 6 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); diff --git a/libavformat/version.h b/libavformat/version.h index 45efaff9b9..feceaedc08 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -32,7 +32,7 @@ // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) // Also please add any ticket numbers that you believe might be affected here #define LIBAVFORMAT_VERSION_MAJOR 58 -#define LIBAVFORMAT_VERSION_MINOR 30 +#define LIBAVFORMAT_VERSION_MINOR 31 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \