From patchwork Fri May 21 18:00:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 27906 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp743594iof; Fri, 21 May 2021 11:02:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyUvZiqkg28ElYg4KtQr8/KhQOckirKdJ0K+zHEsHPKn3wR6zkFnDyYlkGfZiMFSnUQpk9v X-Received: by 2002:aa7:df11:: with SMTP id c17mr12572679edy.317.1621620139917; Fri, 21 May 2021 11:02:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621620139; cv=none; d=google.com; s=arc-20160816; b=KuQBl3K/NW4YarLklhD5Xy1eA8Xy4aZ1HQ1ENnSNI1oJyGILGqKDJ0CUOUHfqdP/kR xh4WHtljRJjNzNtVAG4FpTv0SXmbSAXp8H6oLenTCE9IX/w0ch6SCxL3XFIhz2Rj0OaH Jm56G5YyW3irBmb+k7sov67abHv4b/zoixAHRJ3MSjWQzVyRlbjGcmqKZe1kEKEXgJOs C1PzW5LtBT6sjSne7BuFQU6jpHs++Lb3dWmYl0AchDpSk8iwadCKYBdPqJW/ZLCS+cCq jRJ6YY+P2AMMxU+fi4EMYeH3bsJSzvBOOdzzILvXjOqPBs+FN8GvSesmJ4BXGVFB6iEF L3KA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :delivered-to; bh=K1r7EWJH3vieXusSYumewAZYHRXMguCIwBl3DG1Dmlg=; b=ei8m6kk7xq/W8rn7IHCvUqF/cSet2oGGQPSrXNgLqAhWThrWROHCaOl1ixhhzjf/c5 OTcbWFLMZECGH4TcQ5l5UnGy7MTXKCRLUGdp1uVmKWVDlRkbJjD3zBzn7nbYlTDfhG+r JfRmlZGP1aU6TEX/LY/nvvPkb0wToCor/zIoutfDaiknRWJVP5vyJeUwnqvixZh+ulFs 332W9wesioSEvWQ8jDi2lnEggZ4ufHC8KO2psdi7B1aJi2xLOwz9sgwN4U0ogApXHl88 yjWnxqjQHoWgVImLQXph7jpOXD+Db4XZmD8nNlzZrQmqMmID3qQfTEhRYtX2qX2cpMtK 1w/w== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v7si6606371edd.219.2021.05.21.11.02.18; Fri, 21 May 2021 11:02:19 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 14E1F689AEE; Fri, 21 May 2021 21:01:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 33C066882EE for ; Fri, 21 May 2021 21:01:13 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id E72DE240477 for ; Fri, 21 May 2021 20:01:12 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id 10RBdPdEvuFU for ; Fri, 21 May 2021 20:01:12 +0200 (CEST) Received: from libav.khirnov.net (unknown [IPv6:2a00:c500:561:201:5fb8:4bfe:b578:641e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 67FEC24068A for ; Fri, 21 May 2021 20:01:09 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id C63323A1203; Fri, 21 May 2021 20:01:06 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 May 2021 20:00:32 +0200 Message-Id: <20210521180056.17496-1-anton@khirnov.net> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 01/25] lavc: move small misc definitions into a separate header X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: bE3mjhaf3j+a This will allow to avoid #including the entire avcodec.h in some places. --- doc/APIchanges | 10 +++ libavcodec/Makefile | 1 + libavcodec/avcodec.h | 139 +---------------------------------- libavcodec/defs.h | 170 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 182 insertions(+), 138 deletions(-) create mode 100644 libavcodec/defs.h diff --git a/doc/APIchanges b/doc/APIchanges index c46f4d5304..30203d8ad5 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -14,6 +14,16 @@ libavutil: 2021-04-27 API changes, most recent first: +2021-xx-xx - xxxxxxxxxx - lavc 59.1.100 - avcodec.h defs.h + Add new installed header defs.h. The following definitions are moved + into it from avcodec.h: + - AVDiscard + - AVAudioServiceType + - AVPanScan + - AVCPBProperties and av_cpb_properties_alloc() + - AVProducerReferenceTime + - av_xiphlacing() + 2021-04-27 - cb3ac722f4 - lavc 59.0.100 - avcodec.h Constified AVCodecParserContext.parser. diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 4fa8d7ab10..04f28c6c1c 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -12,6 +12,7 @@ HEADERS = ac3_parser.h \ codec_id.h \ codec_par.h \ d3d11va.h \ + defs.h \ dirac.h \ dv_profile.h \ dxva2.h \ diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 51c29ec54e..1838b9dcdb 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -46,6 +46,7 @@ #include "codec_desc.h" #include "codec_par.h" #include "codec_id.h" +#include "defs.h" #include "packet.h" #include "version.h" @@ -181,16 +182,6 @@ * @{ */ -/** - * @ingroup lavc_decoding - * Required number of additionally allocated bytes at the end of the input bitstream for decoding. - * This is mainly needed because some optimized bitstream readers read - * 32 or 64 bit at once and could read over the end.
- * Note: If the first 23 bits of the additional bytes are not 0, then damaged - * MPEG bitstreams could cause overread and segfault. - */ -#define AV_INPUT_BUFFER_PADDING_SIZE 64 - /** * @ingroup lavc_encoding * minimum encoding buffer size @@ -198,34 +189,6 @@ */ #define AV_INPUT_BUFFER_MIN_SIZE 16384 -/** - * @ingroup lavc_decoding - */ -enum AVDiscard{ - /* We leave some space between them for extensions (drop some - * keyframes for intra-only or drop just some bidir frames). */ - AVDISCARD_NONE =-16, ///< discard nothing - AVDISCARD_DEFAULT = 0, ///< discard useless packets like 0 size packets in avi - AVDISCARD_NONREF = 8, ///< discard all non reference - AVDISCARD_BIDIR = 16, ///< discard all bidirectional frames - AVDISCARD_NONINTRA= 24, ///< discard all non intra frames - AVDISCARD_NONKEY = 32, ///< discard all frames except keyframes - AVDISCARD_ALL = 48, ///< discard all -}; - -enum AVAudioServiceType { - AV_AUDIO_SERVICE_TYPE_MAIN = 0, - AV_AUDIO_SERVICE_TYPE_EFFECTS = 1, - AV_AUDIO_SERVICE_TYPE_VISUALLY_IMPAIRED = 2, - AV_AUDIO_SERVICE_TYPE_HEARING_IMPAIRED = 3, - AV_AUDIO_SERVICE_TYPE_DIALOGUE = 4, - AV_AUDIO_SERVICE_TYPE_COMMENTARY = 5, - AV_AUDIO_SERVICE_TYPE_EMERGENCY = 6, - AV_AUDIO_SERVICE_TYPE_VOICE_OVER = 7, - AV_AUDIO_SERVICE_TYPE_KARAOKE = 8, - AV_AUDIO_SERVICE_TYPE_NB , ///< Not part of ABI -}; - /** * @ingroup lavc_encoding */ @@ -393,86 +356,6 @@ typedef struct RcOverride{ */ #define AV_CODEC_EXPORT_DATA_FILM_GRAIN (1 << 3) -/** - * Pan Scan area. - * This specifies the area which should be displayed. - * Note there may be multiple such areas for one frame. - */ -typedef struct AVPanScan { - /** - * id - * - encoding: Set by user. - * - decoding: Set by libavcodec. - */ - int id; - - /** - * width and height in 1/16 pel - * - encoding: Set by user. - * - decoding: Set by libavcodec. - */ - int width; - int height; - - /** - * position of the top left corner in 1/16 pel for up to 3 fields/frames - * - encoding: Set by user. - * - decoding: Set by libavcodec. - */ - int16_t position[3][2]; -} AVPanScan; - -/** - * This structure describes the bitrate properties of an encoded bitstream. It - * roughly corresponds to a subset the VBV parameters for MPEG-2 or HRD - * parameters for H.264/HEVC. - */ -typedef struct AVCPBProperties { - /** - * Maximum bitrate of the stream, in bits per second. - * Zero if unknown or unspecified. - */ - int64_t max_bitrate; - /** - * Minimum bitrate of the stream, in bits per second. - * Zero if unknown or unspecified. - */ - int64_t min_bitrate; - /** - * Average bitrate of the stream, in bits per second. - * Zero if unknown or unspecified. - */ - int64_t avg_bitrate; - - /** - * The size of the buffer to which the ratecontrol is applied, in bits. - * Zero if unknown or unspecified. - */ - int64_t buffer_size; - - /** - * The delay between the time the packet this structure is associated with - * is received and the time when it should be decoded, in periods of a 27MHz - * clock. - * - * UINT64_MAX when unknown or unspecified. - */ - uint64_t vbv_delay; -} AVCPBProperties; - -/** - * This structure supplies correlation between a packet timestamp and a wall clock - * production time. The definition follows the Producer Reference Time ('prft') - * as defined in ISO/IEC 14496-12 - */ -typedef struct AVProducerReferenceTime { - /** - * A UTC timestamp, in microseconds, since Unix epoch (e.g, av_gettime()). - */ - int64_t wallclock; - int flags; -} AVProducerReferenceTime; - /** * The decoder will keep a reference to the frame and may reuse it later. */ @@ -3300,32 +3183,12 @@ void av_fast_padded_malloc(void *ptr, unsigned int *size, size_t min_size); */ void av_fast_padded_mallocz(void *ptr, unsigned int *size, size_t min_size); -/** - * Encode extradata length to a buffer. Used by xiph codecs. - * - * @param s buffer to write to; must be at least (v/255+1) bytes long - * @param v size of extradata in bytes - * @return number of bytes written to the buffer. - */ -unsigned int av_xiphlacing(unsigned char *s, unsigned int v); - /** * @return a positive value if s is open (i.e. avcodec_open2() was called on it * with no corresponding avcodec_close()), 0 otherwise. */ int avcodec_is_open(AVCodecContext *s); -/** - * Allocate a CPB properties structure and initialize its fields to default - * values. - * - * @param size if non-NULL, the size of the allocated struct will be written - * here. This is useful for embedding it in side data. - * - * @return the newly allocated struct or NULL on failure - */ -AVCPBProperties *av_cpb_properties_alloc(size_t *size); - /** * @} */ diff --git a/libavcodec/defs.h b/libavcodec/defs.h new file mode 100644 index 0000000000..420a042b8f --- /dev/null +++ b/libavcodec/defs.h @@ -0,0 +1,170 @@ +/* + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVCODEC_DEFS_H +#define AVCODEC_DEFS_H + +/** + * @file + * @ingroup libavc + * Misc types and constants that do not belong anywhere else. + */ + +#include +#include + +/** + * @ingroup lavc_decoding + * Required number of additionally allocated bytes at the end of the input bitstream for decoding. + * This is mainly needed because some optimized bitstream readers read + * 32 or 64 bit at once and could read over the end.
+ * Note: If the first 23 bits of the additional bytes are not 0, then damaged + * MPEG bitstreams could cause overread and segfault. + */ +#define AV_INPUT_BUFFER_PADDING_SIZE 64 + +/** + * @ingroup lavc_decoding + */ +enum AVDiscard{ + /* We leave some space between them for extensions (drop some + * keyframes for intra-only or drop just some bidir frames). */ + AVDISCARD_NONE =-16, ///< discard nothing + AVDISCARD_DEFAULT = 0, ///< discard useless packets like 0 size packets in avi + AVDISCARD_NONREF = 8, ///< discard all non reference + AVDISCARD_BIDIR = 16, ///< discard all bidirectional frames + AVDISCARD_NONINTRA= 24, ///< discard all non intra frames + AVDISCARD_NONKEY = 32, ///< discard all frames except keyframes + AVDISCARD_ALL = 48, ///< discard all +}; + +enum AVAudioServiceType { + AV_AUDIO_SERVICE_TYPE_MAIN = 0, + AV_AUDIO_SERVICE_TYPE_EFFECTS = 1, + AV_AUDIO_SERVICE_TYPE_VISUALLY_IMPAIRED = 2, + AV_AUDIO_SERVICE_TYPE_HEARING_IMPAIRED = 3, + AV_AUDIO_SERVICE_TYPE_DIALOGUE = 4, + AV_AUDIO_SERVICE_TYPE_COMMENTARY = 5, + AV_AUDIO_SERVICE_TYPE_EMERGENCY = 6, + AV_AUDIO_SERVICE_TYPE_VOICE_OVER = 7, + AV_AUDIO_SERVICE_TYPE_KARAOKE = 8, + AV_AUDIO_SERVICE_TYPE_NB , ///< Not part of ABI +}; + +/** + * Pan Scan area. + * This specifies the area which should be displayed. + * Note there may be multiple such areas for one frame. + */ +typedef struct AVPanScan { + /** + * id + * - encoding: Set by user. + * - decoding: Set by libavcodec. + */ + int id; + + /** + * width and height in 1/16 pel + * - encoding: Set by user. + * - decoding: Set by libavcodec. + */ + int width; + int height; + + /** + * position of the top left corner in 1/16 pel for up to 3 fields/frames + * - encoding: Set by user. + * - decoding: Set by libavcodec. + */ + int16_t position[3][2]; +} AVPanScan; + +/** + * This structure describes the bitrate properties of an encoded bitstream. It + * roughly corresponds to a subset the VBV parameters for MPEG-2 or HRD + * parameters for H.264/HEVC. + */ +typedef struct AVCPBProperties { + /** + * Maximum bitrate of the stream, in bits per second. + * Zero if unknown or unspecified. + */ + int64_t max_bitrate; + /** + * Minimum bitrate of the stream, in bits per second. + * Zero if unknown or unspecified. + */ + int64_t min_bitrate; + /** + * Average bitrate of the stream, in bits per second. + * Zero if unknown or unspecified. + */ + int64_t avg_bitrate; + + /** + * The size of the buffer to which the ratecontrol is applied, in bits. + * Zero if unknown or unspecified. + */ + int64_t buffer_size; + + /** + * The delay between the time the packet this structure is associated with + * is received and the time when it should be decoded, in periods of a 27MHz + * clock. + * + * UINT64_MAX when unknown or unspecified. + */ + uint64_t vbv_delay; +} AVCPBProperties; + +/** + * Allocate a CPB properties structure and initialize its fields to default + * values. + * + * @param size if non-NULL, the size of the allocated struct will be written + * here. This is useful for embedding it in side data. + * + * @return the newly allocated struct or NULL on failure + */ +AVCPBProperties *av_cpb_properties_alloc(size_t *size); + +/** + * This structure supplies correlation between a packet timestamp and a wall clock + * production time. The definition follows the Producer Reference Time ('prft') + * as defined in ISO/IEC 14496-12 + */ +typedef struct AVProducerReferenceTime { + /** + * A UTC timestamp, in microseconds, since Unix epoch (e.g, av_gettime()). + */ + int64_t wallclock; + int flags; +} AVProducerReferenceTime; + +/** + * Encode extradata length to a buffer. Used by xiph codecs. + * + * @param s buffer to write to; must be at least (v/255+1) bytes long + * @param v size of extradata in bytes + * @return number of bytes written to the buffer. + */ +unsigned int av_xiphlacing(unsigned char *s, unsigned int v); + +#endif // AVCODEC_DEFS_H From patchwork Fri May 21 18:00:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 27905 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp743149iof; Fri, 21 May 2021 11:01:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxtUxr4WSbCeHJIkolYvM8+KaSpur1VW/ZIxVYts497vk4mc0WD0E1WROl0mHNKIP5uAHhp X-Received: by 2002:a17:906:55c1:: with SMTP id z1mr11807391ejp.229.1621620112653; Fri, 21 May 2021 11:01:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621620112; cv=none; d=google.com; s=arc-20160816; b=He9ecYEphrVNUN1mB1HN3yL/tzylMWyLcmkEiJMsGmu0N9fbjg9x22gYaipzyUJY7V ueEHjZq63kJmHZmqXX1etmFPfAKKRwjQhC9TRQCe4g5w6lqstGJzfqeudms5REPWqwOv NQIwiBvQdjtpM+3n4+LWZ4od3IlQktu3MQ3WmqBcZQYWcrTEl1Ox0Mr2fJ4Rot8/Unzf 8dZG+yzsMfu815j6Ghl1GYqT4SIe2WrvuWhLKvzBIg2qRhhKphDYlAoMfkXB7jmq9iF1 ko33K3dNjPzJ7nprumhka9b4wtdnnB9Atb32qPKLgDkOMsG/1Shoa7xfay2Jowul186Q ge7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=K/HXvy0LIVwQgs8skTUIAqNFFDfNYdNASAkfpxUyUcw=; b=in8oZCFu9UE9SxAnjqBWGjsxZAx60ns8nM7tIr6BbW1dJLfE5uIATG/2cZkDe3Eqgy /QyKVLinYlWYCM1H6nP0r3kr590ALpttXqSZnso9V18Ojs6A6KZOrciGaTgX9eYaglun ncgRKXHKaExqsiywYmVqInocSddoIMpWYxjIlhYZTxx874J9bxpobzpWjoRW9oSdUUan bxk3iYkWUXWuxh4Z9D2SGiVhRwh+0Q27+sIw/UiYB5KJwsY8+2THv06bsPXhaCoqCyGS YUV4mC7JuMj74AkgJ9afOjD+O0ekBxFGW5oOgDYJ4MAP4bU1OqnYC4oFRzTX4RQZQb55 TPnA== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p3si3469215edu.599.2021.05.21.11.01.50; Fri, 21 May 2021 11:01:52 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 208BB689A1C; Fri, 21 May 2021 21:01:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C1D826880D3 for ; Fri, 21 May 2021 21:01:12 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 8147424042A for ; Fri, 21 May 2021 20:01:12 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id v-FBdtUUcDUe for ; Fri, 21 May 2021 20:01:12 +0200 (CEST) Received: from libav.khirnov.net (unknown [IPv6:2a00:c500:561:201:5fb8:4bfe:b578:641e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 6719C2405C5 for ; Fri, 21 May 2021 20:01:09 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id C85E13A016B; Fri, 21 May 2021 20:01:06 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 May 2021 20:00:33 +0200 Message-Id: <20210521180056.17496-2-anton@khirnov.net> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210521180056.17496-1-anton@khirnov.net> References: <20210521180056.17496-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 02/25] lavc: move av_get_[exact_]bits_per_sample() to codec_id.h X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Uc2fL2sI85aW --- doc/APIchanges | 4 ++++ libavcodec/avcodec.h | 18 ------------------ libavcodec/codec_id.h | 18 ++++++++++++++++++ 3 files changed, 22 insertions(+), 18 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 30203d8ad5..f8d01caa84 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -14,6 +14,10 @@ libavutil: 2021-04-27 API changes, most recent first: +2021-xx-xx - xxxxxxxxxx - lavc 59.1.100 - avcodec.h codec_id.h + Move av_get_bits_per_sample() and av_get_exact_bits_per_sample() + from avcodec.h to codec_id.h. + 2021-xx-xx - xxxxxxxxxx - lavc 59.1.100 - avcodec.h defs.h Add new installed header defs.h. The following definitions are moved into it from avcodec.h: diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 1838b9dcdb..cec4a0cb24 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3124,14 +3124,6 @@ int avcodec_fill_audio_frame(AVFrame *frame, int nb_channels, */ void avcodec_flush_buffers(AVCodecContext *avctx); -/** - * Return codec bits per sample. - * - * @param[in] codec_id the codec - * @return Number of bits per sample or zero if unknown for the given codec. - */ -int av_get_bits_per_sample(enum AVCodecID codec_id); - /** * Return the PCM codec associated with a sample format. * @param be endianness, 0 for little, 1 for big, @@ -3140,16 +3132,6 @@ int av_get_bits_per_sample(enum AVCodecID codec_id); */ enum AVCodecID av_get_pcm_codec(enum AVSampleFormat fmt, int be); -/** - * Return codec bits per sample. - * Only return non-zero if the bits per sample is exactly correct, not an - * approximation. - * - * @param[in] codec_id the codec - * @return Number of bits per sample or zero if unknown for the given codec. - */ -int av_get_exact_bits_per_sample(enum AVCodecID codec_id); - /** * Return audio frame duration. * diff --git a/libavcodec/codec_id.h b/libavcodec/codec_id.h index 83e1dbb4b3..6141268096 100644 --- a/libavcodec/codec_id.h +++ b/libavcodec/codec_id.h @@ -580,6 +580,24 @@ enum AVMediaType avcodec_get_type(enum AVCodecID codec_id); */ const char *avcodec_get_name(enum AVCodecID id); +/** + * Return codec bits per sample. + * + * @param[in] codec_id the codec + * @return Number of bits per sample or zero if unknown for the given codec. + */ +int av_get_bits_per_sample(enum AVCodecID codec_id); + +/** + * Return codec bits per sample. + * Only return non-zero if the bits per sample is exactly correct, not an + * approximation. + * + * @param[in] codec_id the codec + * @return Number of bits per sample or zero if unknown for the given codec. + */ +int av_get_exact_bits_per_sample(enum AVCodecID codec_id); + /** * @} */ From patchwork Fri May 21 18:00:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 27895 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp742698iof; Fri, 21 May 2021 11:01:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxJsHonXEp4iimohedbDpIibapL4wTT7rFv/hOLr2g1n4QJtV4n7kCqvRkaGj3soJ0vCNPK X-Received: by 2002:a50:a404:: with SMTP id u4mr12599977edb.112.1621620084752; Fri, 21 May 2021 11:01:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621620084; cv=none; d=google.com; s=arc-20160816; b=bYlQjqLj2Uomd92QkyDlPwGuLAEbuvlv/39/oKG2vChxhspNiOCDGE7W6uag9zqg4z PYVykZVYDlrDzRSGU3n7EajtOAr5ezVQoGqJUEF5SHA8OfOnfPJwg+IsY+2C7Ckp05Rm Z0FCyJIME99zWBrs1Grgn1HxwBb3je4UoYmqJdDJ9/e/cNua42Sa/LmR083sVSQkcExz MEscHApS9Nn4e+kiv3yUIW7zxZRNsQtOkt32CMpS8PdK1vhR6C0Z6MmZlbqgRBUjCtXz vZOlPZoIzp1+LJO+TDjsYEZCWxBe0kJEgMblZtW4C7/JtrFZeDdHq8578NABPFFjCxBI zCeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=wUkvSbhltcMMhAxYhcsFD3fTRm7giCItlCTUDIyEoYc=; b=Bc0aF4J2NgTRcj1XmVWzazW3/Qj4qoif+vKiNJyECeJunBANf0NUnUirzPV4DAgiYa PckdSswJgiDkVKqE+1vZsHkFHUZgZ2pd2WSsQOUMmOadM3LExO4Bi7Naecsbw1mO/aTX ZY85cE9Kcoz9EgGGL32WFqI9FZu1HehLJrrUygwzuKp7OscUocv1C8ACKmi/epKGiLtb XrLFd01e1xU8EUiYUq/7CxY5CX+RIiWNoIJV3NM6AmEr4tpyle0dhANAdmGGe8SJbpOd YsWXt3/n0gkqjVddKwwVTOV5jIxOx8iI/NRn9qUegGZPFMrYuHWcyRMcytXdd/V1F0q9 6puQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p23si6274217edw.264.2021.05.21.11.01.23; Fri, 21 May 2021 11:01:24 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DA263680725; Fri, 21 May 2021 21:01:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BF6EA680725 for ; Fri, 21 May 2021 21:01:12 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id DCCA72406A7 for ; Fri, 21 May 2021 20:01:11 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id 5w8IB2HudiHA for ; Fri, 21 May 2021 20:01:09 +0200 (CEST) Received: from libav.khirnov.net (unknown [IPv6:2a00:c500:561:201:5fb8:4bfe:b578:641e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 63C16240476 for ; Fri, 21 May 2021 20:01:09 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id CAE5C3A125B; Fri, 21 May 2021 20:01:06 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 May 2021 20:00:34 +0200 Message-Id: <20210521180056.17496-3-anton@khirnov.net> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210521180056.17496-1-anton@khirnov.net> References: <20210521180056.17496-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 03/25] lavc: move avcodec_profile_name() from avcodec.h to codec_id.h X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: I2oHjPbmJMcO --- doc/APIchanges | 4 ++-- libavcodec/avcodec.h | 13 ------------- libavcodec/codec_id.h | 13 +++++++++++++ 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index f8d01caa84..731d55f10d 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,8 +15,8 @@ libavutil: 2021-04-27 API changes, most recent first: 2021-xx-xx - xxxxxxxxxx - lavc 59.1.100 - avcodec.h codec_id.h - Move av_get_bits_per_sample() and av_get_exact_bits_per_sample() - from avcodec.h to codec_id.h. + Move av_get_bits_per_sample(), av_get_exact_bits_per_sample(), + and avcodec_profile_name() from avcodec.h to codec_id.h. 2021-xx-xx - xxxxxxxxxx - lavc 59.1.100 - avcodec.h defs.h Add new installed header defs.h. The following definitions are moved diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index cec4a0cb24..3787504ec3 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3064,19 +3064,6 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode); */ const char *av_get_profile_name(const AVCodec *codec, int profile); -/** - * Return a name for the specified profile, if available. - * - * @param codec_id the ID of the codec to which the requested profile belongs - * @param profile the profile value for which a name is requested - * @return A name for the profile if found, NULL otherwise. - * - * @note unlike av_get_profile_name(), which searches a list of profiles - * supported by a specific decoder or encoder implementation, this - * function searches the list of profiles from the AVCodecDescriptor - */ -const char *avcodec_profile_name(enum AVCodecID codec_id, int profile); - int avcodec_default_execute(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2),void *arg, int *ret, int count, int size); int avcodec_default_execute2(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2, int, int),void *arg, int *ret, int count); //FIXME func typedef diff --git a/libavcodec/codec_id.h b/libavcodec/codec_id.h index 6141268096..3b1a71f8ea 100644 --- a/libavcodec/codec_id.h +++ b/libavcodec/codec_id.h @@ -598,6 +598,19 @@ int av_get_bits_per_sample(enum AVCodecID codec_id); */ int av_get_exact_bits_per_sample(enum AVCodecID codec_id); +/** + * Return a name for the specified profile, if available. + * + * @param codec_id the ID of the codec to which the requested profile belongs + * @param profile the profile value for which a name is requested + * @return A name for the profile if found, NULL otherwise. + * + * @note unlike av_get_profile_name(), which searches a list of profiles + * supported by a specific decoder or encoder implementation, this + * function searches the list of profiles from the AVCodecDescriptor + */ +const char *avcodec_profile_name(enum AVCodecID codec_id, int profile); + /** * @} */ From patchwork Fri May 21 18:00:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 27902 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp742937iof; Fri, 21 May 2021 11:01:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwpyiDML0pR02YNsNuUKpBz0fUHnBow4KRk+dtDHHnm6d8WEQLArzUCe1nSkYDfO/nBfiDJ X-Received: by 2002:a05:6402:2215:: with SMTP id cq21mr12522906edb.28.1621620098685; Fri, 21 May 2021 11:01:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621620098; cv=none; d=google.com; s=arc-20160816; b=z3tT0O645zPG70I0pVJH74S7ACf6DMvWL+6UTLw41owal61MM1hhTXuYn1nwiM0JWi MqvVPJh0LqxF9kVyH8dYCqWXi41LGYaAHll6glS4UzMYC8RrCH++wEruSwFjKjV3XAyK nGehbC59O6JJrDSVTcNLY9WPbHHnS/YdU9K106slorhG+P1Y4eSqkkyzti5ttfKwNTcG GA3N1napfbBc24GcsBlnBQhvp9bJVty6kpoKS+kk2Dd7lS6kzQpkNpDPQuUhX5Ckbzbn fNIcwi4I0Y+ObcE+t3SxbdAdQ1ZSLD0CYXAxyfjPyZImUoLHb52lR156DRVNvF9ckZzH BPVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=DW8xSFpTtFP5n5nCv9/9EdoPtHZGBUs7Wu2Xl62yS6s=; b=SfMt+MDUothY4hOv/nhsY6z1HGMV00/m7YhNuNWvVWPzH8COeC69b1HifzhtvdAvDH AUIlYjaCj8a5Y9mcGCatgiAsI5SJPB962ANxJH/G65R+JWNYYCN8j6xuQcmhqeP3y0MN c/1Q/vHSlP5TZ/xkP7rAXLGsNnCtOlDdp4RoEW5ekVxPRMxNOpTplVWpUkSOsVVfq7T6 2s1MvHFG5MU6tfoE4PkzF4tRrDv4fKKJQwux/PuhdJg2k3t8YuELHPwJ1g48+4s3lxNW BAZAdO3vWUz8pqYLoappolE4ofE+gzlS3kMpv9FojXo2mOnSBnKx/QkvE1efUdnejVYW xMAw== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e1si5664954edk.506.2021.05.21.11.01.38; Fri, 21 May 2021 11:01:38 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E121F68818D; Fri, 21 May 2021 21:01:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C43696881C5 for ; Fri, 21 May 2021 21:01:12 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 07BB8240476 for ; Fri, 21 May 2021 20:01:12 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id Xhq2q75n0uRN for ; Fri, 21 May 2021 20:01:09 +0200 (CEST) Received: from libav.khirnov.net (unknown [IPv6:2a00:c500:561:201:5fb8:4bfe:b578:641e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 6183124042A for ; Fri, 21 May 2021 20:01:09 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id D15783A13C0; Fri, 21 May 2021 20:01:06 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 May 2021 20:00:35 +0200 Message-Id: <20210521180056.17496-4-anton@khirnov.net> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210521180056.17496-1-anton@khirnov.net> References: <20210521180056.17496-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 04/25] lavc: move av_get_audio_frame_duration2() from avcodec.h to codec_par.h X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: FS1KA2ZcaMyM --- doc/APIchanges | 3 +++ libavcodec/avcodec.h | 6 ------ libavcodec/codec_par.h | 5 +++++ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 731d55f10d..540a0c8b4d 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -14,6 +14,9 @@ libavutil: 2021-04-27 API changes, most recent first: +2021-xx-xx - xxxxxxxxxx - lavc 59.1.100 - avcodec.h codec_par.h + Move av_get_audio_frame_duration2() from avcodec.h to codec_par.h. + 2021-xx-xx - xxxxxxxxxx - lavc 59.1.100 - avcodec.h codec_id.h Move av_get_bits_per_sample(), av_get_exact_bits_per_sample(), and avcodec_profile_name() from avcodec.h to codec_id.h. diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 3787504ec3..51caab7dce 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3129,12 +3129,6 @@ enum AVCodecID av_get_pcm_codec(enum AVSampleFormat fmt, int be); */ int av_get_audio_frame_duration(AVCodecContext *avctx, int frame_bytes); -/** - * This function is the same as av_get_audio_frame_duration(), except it works - * with AVCodecParameters instead of an AVCodecContext. - */ -int av_get_audio_frame_duration2(AVCodecParameters *par, int frame_bytes); - /* memory */ /** diff --git a/libavcodec/codec_par.h b/libavcodec/codec_par.h index 948758e237..10cf79dff1 100644 --- a/libavcodec/codec_par.h +++ b/libavcodec/codec_par.h @@ -221,6 +221,11 @@ void avcodec_parameters_free(AVCodecParameters **par); */ int avcodec_parameters_copy(AVCodecParameters *dst, const AVCodecParameters *src); +/** + * This function is the same as av_get_audio_frame_duration(), except it works + * with AVCodecParameters instead of an AVCodecContext. + */ +int av_get_audio_frame_duration2(AVCodecParameters *par, int frame_bytes); /** * @} From patchwork Fri May 21 18:00:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 27900 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp743340iof; Fri, 21 May 2021 11:02:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJws4w+aO3xjudPtlcKvFufIX9WpexXHUU7e62QfnD9+6MvS+xP7IoxbZnHte7B0F9Xk4wVv X-Received: by 2002:a05:6402:46:: with SMTP id f6mr12616479edu.252.1621620125017; Fri, 21 May 2021 11:02:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621620125; cv=none; d=google.com; s=arc-20160816; b=N1M1viBGpkibGvSng3T2eZITkxMJbLpzaj0ds7RO8dXxNjVm63cXhXTxuQLfIoRoOz ek7bE8PfecE20daCxfN996RELQoX98g99jcoe3VlOiQh/C/0aEJHLPGpaLk4KfAIQkmG 38kiR9u6ejz+dic/OuE8QzVejEbTSAP7XPzrP3463AkvZOpt0m5d2Lj3BvD37HKhohhX VBCpIN22PCzaX+avD/a+4D3fgoxvTyK9goF/ivZKdX1+CqjOwb333Zuj41HN7IhRn33P 1piKmQT1ozTBX+fYw2xGB8KsF1FRFsSiIBmR69bG11+rzOFnHvA0TlrcrOu8OMG3Zuk5 YjLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=fLh6lgInzH00GhJXzmiuKX0GZlnbG0Rb2ZEuekU+TUQ=; b=bEXUVIyNg6Pr7kVVNq81oVKkpn0oqgqLQMKsF31w9xp9xZwdLjPwr1HgT3AEI/pf+2 zajwTYK8I2aVODAkwLF8AeOH+dF2Ssz9M1VGSjFe2eDj02tLvh+2DIJRBNP7LCJJcubk +q08DYGMgkR1fa+FU9+SFN2/LKuaRxse4b6zUJZ1qNQDvsJWtf462cjEJgW3Gh7JI1sl /qLuMaA94/W+Mlx571GjJ/Uh+T2wtWO0asXXQxVLKirzEdTVmoE+ZVtRj7DglM9BFk0k Q7UBU0JppPIT/7vBnpC7Jsqy5WrNgPaXVWU5Z00DOn3qqtgMbWQTyB6IxryZs2HKR+g3 ls+A== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d5si6100514ejt.21.2021.05.21.11.02.04; Fri, 21 May 2021 11:02:04 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1CAD068993C; Fri, 21 May 2021 21:01:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2FED06880D3 for ; Fri, 21 May 2021 21:01:13 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id D6FF72405C5 for ; Fri, 21 May 2021 20:01:12 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id zICHL_4yNTZS for ; Fri, 21 May 2021 20:01:12 +0200 (CEST) Received: from libav.khirnov.net (unknown [IPv6:2a00:c500:561:201:5fb8:4bfe:b578:641e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 65A52240477 for ; Fri, 21 May 2021 20:01:09 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id D55B63A13C3; Fri, 21 May 2021 20:01:06 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 May 2021 20:00:36 +0200 Message-Id: <20210521180056.17496-5-anton@khirnov.net> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210521180056.17496-1-anton@khirnov.net> References: <20210521180056.17496-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/25] lavc: move av_get_profile_name() from avcodec.h to codec.h X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: SXDT3NI/fwJE --- doc/APIchanges | 3 +++ libavcodec/avcodec.h | 9 --------- libavcodec/codec.h | 9 +++++++++ 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 540a0c8b4d..e21970812b 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -14,6 +14,9 @@ libavutil: 2021-04-27 API changes, most recent first: +2021-xx-xx - xxxxxxxxxx - lavc 59.1.100 - avcodec.h codec.h + Move av_get_profile_name() from avcodec.h to codec.h. + 2021-xx-xx - xxxxxxxxxx - lavc 59.1.100 - avcodec.h codec_par.h Move av_get_audio_frame_duration2() from avcodec.h to codec_par.h. diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 51caab7dce..1ca1ce0410 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3055,15 +3055,6 @@ enum AVPixelFormat avcodec_default_get_format(struct AVCodecContext *s, const en void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode); -/** - * Return a name for the specified profile, if available. - * - * @param codec the codec that is searched for the given profile - * @param profile the profile value for which a name is requested - * @return A name for the profile if found, NULL otherwise. - */ -const char *av_get_profile_name(const AVCodec *codec, int profile); - int avcodec_default_execute(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2),void *arg, int *ret, int count, int size); int avcodec_default_execute2(AVCodecContext *c, int (*func)(AVCodecContext *c2, void *arg2, int, int),void *arg, int *ret, int count); //FIXME func typedef diff --git a/libavcodec/codec.h b/libavcodec/codec.h index c8653e3b31..cedd106953 100644 --- a/libavcodec/codec.h +++ b/libavcodec/codec.h @@ -402,6 +402,15 @@ int av_codec_is_encoder(const AVCodec *codec); */ int av_codec_is_decoder(const AVCodec *codec); +/** + * Return a name for the specified profile, if available. + * + * @param codec the codec that is searched for the given profile + * @param profile the profile value for which a name is requested + * @return A name for the profile if found, NULL otherwise. + */ +const char *av_get_profile_name(const AVCodec *codec, int profile); + enum { /** * The codec supports this format via the hw_device_ctx interface. From patchwork Fri May 21 18:00:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 27899 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp744155iof; Fri, 21 May 2021 11:02:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw8xs3f6c4hswqF74NRelaeMGIliKZtVug8ae7EB8IpKMbQGfn2q8AEsGXujRBvHVGJixah X-Received: by 2002:a05:6402:22a8:: with SMTP id cx8mr12677059edb.296.1621620175371; Fri, 21 May 2021 11:02:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621620175; cv=none; d=google.com; s=arc-20160816; b=v8OKGpH4y5P5HyIw3ayYSLVH4eM/ypgW2LdJrZcym1QYazVwWdYiUxXVPjfIg+BKAy p2oJt6h6pT9mDlpbtPh8hEeGcc2YuBaFxSALQqUFMq19VK1wcx6FYNWO4b86zR7HmAYC C1OiPWCELloajEXicDdg6NZhXRrNnnNwSjKjI6KbTuLbr/52Kicjk1PwG6t+vFbZ4CGQ QaY2owfsgVsdEnIeNWl3TvS/02+Z+rjSJugayCw2kp6c4JnxzuUe8ZMB2r5vS9VAU3vl 1unF8cVbqyOkq95eq99a5m03kmPG2GJp8aMpkIpIzKGVIi5r+S502MNrNOK/ce0WjftV NuRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=pg6MgrtGHCQIIayqyzl/mxSOnauotpMn4NTB9Qo3at4=; b=R12MBSOOo8ZBEXC0wD4GfSGeoa6J5YRfAj4BuPIpGsYK6sfFLCuPcnD+gUkg++LKsw mbrPVJSqLkKdVNin2t0E8xuYuadqeEUvmbKCP8eGcOcQp1kdqrbhmYCWNySQAkYGzeAE F93GlIP7K1nTR2Ks9/QB9sl6CcFXRXLeiYAxtEGSN2lIsAOvGIsfr5sW/g/oFTfPR6u2 IzEEpsYyRVR+3+t+9hAcmXPIeU+7IHhJ4DK48dM8rzCf9Zstau8URuEwOJYNLCAIyYJz YIyDNSz53S6xNN3q1mgZaJ/1Ro5CUTI6jOGBLczHQJdeW6uMSTnSUBKPIscMUdZTGiE0 o1Jw== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e7si7589911edk.255.2021.05.21.11.02.53; Fri, 21 May 2021 11:02:55 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D60A8689D2E; Fri, 21 May 2021 21:01:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4BC4A688335 for ; Fri, 21 May 2021 21:01:18 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 4AA2D240698 for ; Fri, 21 May 2021 20:01:15 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id M9jKrLosDi_o for ; Fri, 21 May 2021 20:01:14 +0200 (CEST) Received: from libav.khirnov.net (unknown [IPv6:2a00:c500:561:201:5fb8:4bfe:b578:641e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id C89D9240696 for ; Fri, 21 May 2021 20:01:09 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id D94FC3A13E8; Fri, 21 May 2021 20:01:06 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 May 2021 20:00:37 +0200 Message-Id: <20210521180056.17496-6-anton@khirnov.net> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210521180056.17496-1-anton@khirnov.net> References: <20210521180056.17496-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 06/25] lavc/cbs: avoid an AVCodecContext dependency X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: wTtQC1o/chc4 This will allow to stop including avcodec.h in future commits. --- libavcodec/av1_parser.c | 3 ++- libavcodec/av1dec.c | 5 ++--- libavcodec/cbs.c | 10 ++++------ libavcodec/cbs.h | 11 ++++------- 4 files changed, 12 insertions(+), 17 deletions(-) diff --git a/libavcodec/av1_parser.c b/libavcodec/av1_parser.c index b6c8004ee3..29a979111e 100644 --- a/libavcodec/av1_parser.c +++ b/libavcodec/av1_parser.c @@ -73,7 +73,8 @@ static int av1_parser_parse(AVCodecParserContext *ctx, if (avctx->extradata_size && !s->parsed_extradata) { s->parsed_extradata = 1; - ret = ff_cbs_read_extradata_from_codec(s->cbc, td, avctx); + ret = ff_cbs_read_extradata_raw(s->cbc, td, avctx->extradata, + avctx->extradata_size); if (ret < 0) { av_log(avctx, AV_LOG_WARNING, "Failed to parse extradata.\n"); } diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index 1dda0f9160..4caa7c3a9d 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -657,9 +657,8 @@ static av_cold int av1_decode_init(AVCodecContext *avctx) av_opt_set_int(s->cbc->priv_data, "operating_point", s->operating_point, 0); if (avctx->extradata && avctx->extradata_size) { - ret = ff_cbs_read_extradata_from_codec(s->cbc, - &s->current_obu, - avctx); + ret = ff_cbs_read_extradata_raw(s->cbc, &s->current_obu, + avctx->extradata, avctx->extradata_size); if (ret < 0) { av_log(avctx, AV_LOG_WARNING, "Failed to read extradata.\n"); return ret; diff --git a/libavcodec/cbs.c b/libavcodec/cbs.c index bbfafb6530..960114cb0e 100644 --- a/libavcodec/cbs.c +++ b/libavcodec/cbs.c @@ -276,13 +276,11 @@ int ff_cbs_read_extradata(CodedBitstreamContext *ctx, par->extradata_size, 1); } -int ff_cbs_read_extradata_from_codec(CodedBitstreamContext *ctx, - CodedBitstreamFragment *frag, - const AVCodecContext *avctx) +int ff_cbs_read_extradata_raw(CodedBitstreamContext *ctx, + CodedBitstreamFragment *frag, + const uint8_t *data, size_t size) { - return cbs_read_data(ctx, frag, NULL, - avctx->extradata, - avctx->extradata_size, 1); + return cbs_read_data(ctx, frag, NULL, data, size, 1); } int ff_cbs_read_packet(CodedBitstreamContext *ctx, diff --git a/libavcodec/cbs.h b/libavcodec/cbs.h index f022282b75..8b432393b8 100644 --- a/libavcodec/cbs.h +++ b/libavcodec/cbs.h @@ -263,15 +263,12 @@ int ff_cbs_read_extradata(CodedBitstreamContext *ctx, const AVCodecParameters *par); /** - * Read the extradata bitstream found in a codec context into a + * Read the extradata bitstream provided as a raw array of bytes into a * fragment, then split into units and decompose. - * - * This acts identical to ff_cbs_read_extradata() for the case where - * you already have a codec context. */ -int ff_cbs_read_extradata_from_codec(CodedBitstreamContext *ctx, - CodedBitstreamFragment *frag, - const AVCodecContext *avctx); +int ff_cbs_read_extradata_raw(CodedBitstreamContext *ctx, + CodedBitstreamFragment *frag, + const uint8_t *data, size_t size); /** * Read the data bitstream from a packet into a fragment, then From patchwork Fri May 21 18:00:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 27908 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp746377iof; Fri, 21 May 2021 11:05:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxJPOEKZ09d+C8uaeCI85/SgvjWfW6D3cJMEX04fP3GUfGj4QEKhiQeO0zydGe7BkZKnx10 X-Received: by 2002:aa7:cac2:: with SMTP id l2mr8430371edt.105.1621620344502; Fri, 21 May 2021 11:05:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621620344; cv=none; d=google.com; s=arc-20160816; b=mcL8Cmn0nDVOwKNN8zBopCF4KmQ6bvfWIU3j6QzB2gNOnhG4gCDQWOYcOa0yOKWwlt BTRoDInXNHhAEqscz+FYiMHfrhGHs3EcmWAjH+gPSzDX1J6KEOUqE15v0xVRY4/9Rrui pUzbYJqydHS71DWK469LOHIRN4s0uMdFOJXB/Hr402VDdI7d4JFXiihGeaMTZuzljdHD H9C/Fx+DFyAe/yBnseZHFD6qm4GlxSkHdJi6Wu7zalc9b6JrfIn2RuTegZRwhtM2YYxA lmf8ulF/EiYqL7uFhio0qTDzFTg/CkYmDb3iTFzRf9Bs86c/34z2gIt2co/JmiLGbpdW 9ktQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=V/E2JUt1Cz51fBwPiYB++4UtQS6kfZcPeQyBzaAhqp8=; b=YcBfw+7/M1gfZHuAxLRBz9v9lh0mf1dW2QneP9j+JDSAEUNx31PGr2cg5/XI8NIrkt NJP32SFqqltCYf/1vUs0d1BQzrzzPLm+UWDWyqCKJNPdq2jWFz1zn2N/yBlKtSNsuTKr sy3TlpbOBTU+1W9ftXUUhzpvQvIla7Zw0bmSNCKJcGj46zY/cyLS8QLNCT1T7ub2IDVt ZzxReELh/nvX5nnriMWn09B00UCdlvY+zl7ezeg3AkjfG9NuxhrIo2lPfeBlu4wys9Ep CMrOvZspDaon1DWbw8iHlG34CsmohFH4O4USODKoJ+XepVL4wEe3KkTLUxvzhM2Tg1vF 7NlA== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id di24si5483768edb.224.2021.05.21.11.05.44; Fri, 21 May 2021 11:05:44 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7325B689F8C; Fri, 21 May 2021 21:01:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 21FCD689B11 for ; Fri, 21 May 2021 21:01:18 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 47A6424068A for ; Fri, 21 May 2021 20:01:13 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id 94TMHrF_dRkg for ; Fri, 21 May 2021 20:01:12 +0200 (CEST) Received: from libav.khirnov.net (unknown [IPv6:2a00:c500:561:201:5fb8:4bfe:b578:641e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id C438D240692 for ; Fri, 21 May 2021 20:01:09 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id DD1E83A1420; Fri, 21 May 2021 20:01:06 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 May 2021 20:00:38 +0200 Message-Id: <20210521180056.17496-7-anton@khirnov.net> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210521180056.17496-1-anton@khirnov.net> References: <20210521180056.17496-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 07/25] lavc/cbs_bsf.h: explicitly #include all required headers X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Tuwe6dkvTS44 --- libavcodec/cbs_bsf.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavcodec/cbs_bsf.h b/libavcodec/cbs_bsf.h index 6be95abc3f..a370be1b5f 100644 --- a/libavcodec/cbs_bsf.h +++ b/libavcodec/cbs_bsf.h @@ -19,7 +19,13 @@ #ifndef AVCODEC_CBS_BSF_H #define AVCODEC_CBS_BSF_H +#include "libavutil/log.h" +#include "libavutil/opt.h" + +#include "bsf.h" +#include "codec_id.h" #include "cbs.h" +#include "packet.h" typedef struct CBSBSFType { From patchwork Fri May 21 18:00:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 27904 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp743812iof; Fri, 21 May 2021 11:02:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxjHHxRw9yZzF4MRexW8Zwc+UoihfXJhMlfzYmMT0sEg5qGUsYcLtrbMBebhF7UlUCAFlBJ X-Received: by 2002:a17:906:2bd0:: with SMTP id n16mr11861348ejg.110.1621620152277; Fri, 21 May 2021 11:02:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621620152; cv=none; d=google.com; s=arc-20160816; b=K4Oy2rixWYHHtZmo5qSeoApzuS3wcdUdtyr5dONuBlP8s68QXPsQDUUpCbNN4l+y0d SEC3oC25U6PhZSI9sjMmrXjpp+xmv76XAdBAofuOXXFx9wqWIDthZPbg2wkYqQ+Ig9p8 2+pnJiBj7HX0WfF0BjoLfTKtBDevsCqC/cdeFOJBWxr+F40Zcec1M8l59vYnEsR3KMON BedEAx7Ko4Vpu38s8NvCGVtBCZlmMDnNTCD9HGHxW1WJ2BRfa+opukLc7WATT7QOTUNX EwZl0pqbWIy0YD3Ss5R7TW3NSy7P6HkYFKXzRVXnkCgpTVZusUmvkvl3ev8pToSJfAtB +G/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=SZHr8MPisvfbNfKEaKuT5uTAPIp140CkYnpHaMS/U9M=; b=iRbsB3Z+4s7NG7aBxbVE2ZnaulsSZcPXajjZcqkRDqqVkZ4TQFliAQmc8igXhLJ7Hb pjrzqF69M4BOhf1LLNZjAC6UFEoD0XttOWPKX1KlwIU4mNpop2PM2SP71NNoD+HrFhSa 7eIc2JxU+9/lLcO7S10CHQfpr0DD1qp/TDuRQ+XEZ1HnCZL55wiVNbqcvpCPdrDgrZyR pqoImfs/XAanHv3QHTQdwGGx3Hyg446frMw1+HItb5LFKgHDVFiXYzcbggOdUnT4YPJH NGtFNWBh9qFFrxsiZyYOnTOBgo1kfv2jVTvxAK4U83A1rjstOx/TN7ne/cfXb3O8b0S4 f8vg== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id lj11si5948952ejb.265.2021.05.21.11.02.31; Fri, 21 May 2021 11:02:32 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2D4C0689B11; Fri, 21 May 2021 21:01:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 47EEE6882FB for ; Fri, 21 May 2021 21:01:18 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 825DC240697 for ; Fri, 21 May 2021 20:01:14 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id JWVPUw0bMLX6 for ; Fri, 21 May 2021 20:01:12 +0200 (CEST) Received: from libav.khirnov.net (unknown [IPv6:2a00:c500:561:201:5fb8:4bfe:b578:641e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id C69B8240694 for ; Fri, 21 May 2021 20:01:09 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id E10843A1421; Fri, 21 May 2021 20:01:06 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 May 2021 20:00:39 +0200 Message-Id: <20210521180056.17496-8-anton@khirnov.net> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210521180056.17496-1-anton@khirnov.net> References: <20210521180056.17496-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 08/25] lavc/cbs.h: avoid avcodec.h dependency X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: E6G9OFGM2/RA Include only the headers that are actually needed. --- libavcodec/cbs.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/cbs.h b/libavcodec/cbs.h index 8b432393b8..509f76b9c6 100644 --- a/libavcodec/cbs.h +++ b/libavcodec/cbs.h @@ -24,7 +24,9 @@ #include "libavutil/buffer.h" -#include "avcodec.h" +#include "codec_id.h" +#include "codec_par.h" +#include "packet.h" /* From patchwork Fri May 21 18:00:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 27907 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp746209iof; Fri, 21 May 2021 11:05:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzOq/UMVVwH0DWDOOaAGqb39iV/1aj20y5YU/99fke2ZwSfAw+ZpyTYnSchOGw94/fT8vHn X-Received: by 2002:a17:906:4b19:: with SMTP id y25mr11946649eju.49.1621620332712; Fri, 21 May 2021 11:05:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621620332; cv=none; d=google.com; s=arc-20160816; b=TxR4H58Fsuw5NW0hMTW0BkMWGWMDH51/S2n1nu+bMA0bFZ4H85XvhZQ0ihuPLordSx 1FaYcZX7fdNTdXSeaOHVi9xLnP27mEhFMIlXULM2zlgzw3BPkBjY0lhjiCYVqADmX7cn 2LrnUf9cI6mM7tm6BeJ9hSznLufWlxnPNqoWzceiP6pS0KeB6EAbRT1TBlFIZTY+i7fk yjd3AYDWWsBKqwFBRN4dVlHcv1VcpRnaX4oGfsFl93ZGOrU8/lcwXvRXKFaoZQYWIPTW 7fEdKWhuH4ZGm7wE+P6lbwikLQkdPzD/6BirB+iwuM07y1OBCUJrsPVkssAXQMCZSVim k+sA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=c9cbEsrywBMHmCYuyPYNkDFV58CiB00sAL0n5oweuoE=; b=LCYHzOGv12uUSiGK/W6/KEpvyee6ljJea4fu0eSjQRdq4ftbKTa/fYVofrv2jIBVvY +PgfIcggrbk0sJ1wKdeN9FsLDyuwGeePzjSr1s/chyQAaTXdmU4iVRpcCUOwwbBbsGCq MW6v2rgUT7Ps5UoseGrvPLEsYRXBtseJRTM692GexXjxw/nKcCHyaoycR3uHYfSQkkLJ cJpin2FYzG2vXer5EeWLLKrvk3+n1jiHUa7Zot4G8g5OjASwkBTtOXfLWzsdzb2muXSS g64TryK0P5xKzCNdU3vYMTR7TgJP2QfZmSYJBdLLdUsMhqGwW2nUtvzL3QaT0lQ6iZk7 16tw== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ay13si5628848edb.577.2021.05.21.11.05.32; Fri, 21 May 2021 11:05:32 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8F975689F59; Fri, 21 May 2021 21:01:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2196D689B0B for ; Fri, 21 May 2021 21:01:18 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 9F6B6240692 for ; Fri, 21 May 2021 20:01:13 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id hugsWZ7HLm9p for ; Fri, 21 May 2021 20:01:13 +0200 (CEST) Received: from libav.khirnov.net (unknown [IPv6:2a00:c500:561:201:5fb8:4bfe:b578:641e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id C69A4240693 for ; Fri, 21 May 2021 20:01:09 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id E50873A142D; Fri, 21 May 2021 20:01:06 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 May 2021 20:00:40 +0200 Message-Id: <20210521180056.17496-9-anton@khirnov.net> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210521180056.17496-1-anton@khirnov.net> References: <20210521180056.17496-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 09/25] lavc/cbs_internal: clean up headers X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: eNaFJGw3gTcg Include all required headers explicitly, avoid avcodec.h dependency. --- libavcodec/cbs_internal.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavcodec/cbs_internal.h b/libavcodec/cbs_internal.h index a392880036..f853086fa3 100644 --- a/libavcodec/cbs_internal.h +++ b/libavcodec/cbs_internal.h @@ -19,8 +19,13 @@ #ifndef AVCODEC_CBS_INTERNAL_H #define AVCODEC_CBS_INTERNAL_H -#include "avcodec.h" +#include + +#include "libavutil/buffer.h" +#include "libavutil/log.h" + #include "cbs.h" +#include "codec_id.h" #include "get_bits.h" #include "put_bits.h" From patchwork Fri May 21 18:00:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 27909 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp746531iof; Fri, 21 May 2021 11:05:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwGvi8ZYiSuDJcR75VafplXqOnnIn7eqrGlB8S14v35lKplGGXXRs3p3H45hrVcf/WjT7JM X-Received: by 2002:a17:906:d1d1:: with SMTP id bs17mr11642669ejb.492.1621620354549; Fri, 21 May 2021 11:05:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621620354; cv=none; d=google.com; s=arc-20160816; b=x4/Nt0KhPdYPFMnp9BOAk67gJwMFpFIQZ8JQWEthDgpLidfe8QnO9twBYxHmAe0ZDe BZpgkjSDWf+YMTuzpts064qR275xQ/GGiJQGWqaShu10sxOdYtfCAvRPbsfxfE38HAm4 GeM/cHnu7lOHvWsH/rJqu7kggMRsdOxwjenfP22Ksev2Na8sTrSzJXJ/z75g3mgXds8M nDbplqyLdVpcmhdz7XqF/E0VhNksHIQYKSudnnFz6FpWb8xWehZLRBO8immTsYGcMXdJ Sx92LPAbpFFingC6r+edQcfyWzmnVsMjTtwSKRn/YYiOUz20UI12u74N3SNWGh39nIgJ Xt5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=sq0d52YNyQ6CzlGnPlH/OncE0U6lPhk9RsDn5p2p9Mg=; b=M1/neq6vZmvU6o2bNqULz7SPBwfTV3pOaoAfI8DxhV78Tz5rTfC8ckKcq9ZL6gmyxV TXk1twc1uTWL1bCDz7DeRzbGdkhBtLcasdeYCK/xEDiyT/Bift4fczIVFQihTWMEBrH0 12G1t8T7fC75j1+WN0gmckDQhZOWkt0/ywJeyPlvS/zJBS0S38NFoDm0Y50oJz/bsPvs UPBhALYgD+gwI07NAq+wxSuKgLPq2T+tIa9OchMsB4Q0207G/uQFeY9NBYXswmVnsOAb E8WN+y0QIHak9R98v7hJZqQU/fJhjS4EmErn59iuJ/h2Eto18+NqyXp2Nf5k0AVjo6P4 C4Hw== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y1si6027164eda.11.2021.05.21.11.05.54; Fri, 21 May 2021 11:05:54 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4C08C689FCE; Fri, 21 May 2021 21:01:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 22FC4689B2D for ; Fri, 21 May 2021 21:01:18 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 10F3B240693 for ; Fri, 21 May 2021 20:01:14 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id I4Qv5LQIlCRK for ; Fri, 21 May 2021 20:01:13 +0200 (CEST) Received: from libav.khirnov.net (unknown [IPv6:2a00:c500:561:201:5fb8:4bfe:b578:641e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id C8A20240697 for ; Fri, 21 May 2021 20:01:09 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id E8FA33A1563; Fri, 21 May 2021 20:01:06 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 May 2021 20:00:41 +0200 Message-Id: <20210521180056.17496-10-anton@khirnov.net> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210521180056.17496-1-anton@khirnov.net> References: <20210521180056.17496-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 10/25] lavc/dolby_e_parser: #include avcodec.h explicitly X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: frqfLxMrytjz This file uses definitions from it, but relies on an indirect include through get_bits.h --- libavcodec/dolby_e_parser.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/dolby_e_parser.c b/libavcodec/dolby_e_parser.c index 8e187523f3..ab8f1b6ef1 100644 --- a/libavcodec/dolby_e_parser.c +++ b/libavcodec/dolby_e_parser.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "avcodec.h" #include "dolby_e.h" #include "get_bits.h" #include "put_bits.h" From patchwork Fri May 21 18:00:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 27894 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp744707iof; Fri, 21 May 2021 11:03:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxXVOLpfnP/jefUmTe26IuK1U7FHM4hTHl9YR9wlFDk9Vt6YspXuyLVheLTcsQthcX/2Pix X-Received: by 2002:a17:907:c1c:: with SMTP id ga28mr11949362ejc.320.1621620217850; Fri, 21 May 2021 11:03:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621620217; cv=none; d=google.com; s=arc-20160816; b=PXUpEtBbqo8/ukKNS5N643pq6LaHk5/YX9Cy0Jefyldjt1yx0ciX3I+WQWRpb/vCsc PxTioW6pLnpX0g8JiAnn+eJvZW/Eeu+Rl8jtxQtYFuDYkE4OMd0E41eHnX6qN1BkpYz4 WSqe69OIHcTBFiCkQGS5RGo0LOcEDatmhZM2D37I2Ryvt7soUY6Ga7X8/wOkD2+nSifu asTPRwj3ydNdxPmi8qZKkHkoEqNHuqXlI8B/xJHpQttN5K8dSAN80eAwbvmrtQr1vnkD qqC/RceMb1ohKZgFpetO2XoMs0S5UHumV0ZuiangIlCaH6JMLYMZyZZUAH+W0qcpvd3T bKAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=9N+oKYyCcAk4DLRd0r4TVBNiloFcMzbDE/C2dfrTWXk=; b=FpE22YxIvKrhPYZx4vpp0sVD3jgfmjnFTu6I/AGh+D31b2QlHhmHqkgiAbGenpH+f6 4vCJwcj1ZDgNnWpwtO0xZcGaF8KUTXTTLNHmB/0USyn51JprLN3dX/gqautG0NvcqZ+T OD6GxJ/p3/nnT4uMtcqqdzs8lsbndNzN5/eiLMWV4PuWksusSRNNtjUJdxk6YOLzn4G3 klr+xhk/MGHEDAYOTUrE+AlDXH+Eh3aTtOMu430i6SsbaLrNbsiTDhz51yVI9xhSUN+S zbukx1SdFoLccLaKu6QR7C6iul6k4Qsv8xDvBcORNM9ffiEbYOnM71n1j4vIidPwuhMp hYOg== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p17si6609688edq.129.2021.05.21.11.03.36; Fri, 21 May 2021 11:03:37 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1316F689D84; Fri, 21 May 2021 21:01:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 84281689200 for ; Fri, 21 May 2021 21:01:18 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 94DF724069A for ; Fri, 21 May 2021 20:01:16 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id jNtymQHH95cb for ; Fri, 21 May 2021 20:01:14 +0200 (CEST) Received: from libav.khirnov.net (unknown [IPv6:2a00:c500:561:201:5fb8:4bfe:b578:641e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id EA45E240699 for ; Fri, 21 May 2021 20:01:09 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id ECE673A15EB; Fri, 21 May 2021 20:01:06 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 May 2021 20:00:42 +0200 Message-Id: <20210521180056.17496-11-anton@khirnov.net> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210521180056.17496-1-anton@khirnov.net> References: <20210521180056.17496-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 11/25] lavc/mlp_parse: add required includes explicitly X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: jPsfbZUJNWoH --- libavcodec/mlp_parse.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/mlp_parse.h b/libavcodec/mlp_parse.h index a0790ae8c7..f0d7b41c11 100644 --- a/libavcodec/mlp_parse.h +++ b/libavcodec/mlp_parse.h @@ -21,6 +21,10 @@ #ifndef AVCODEC_MLP_PARSE_H #define AVCODEC_MLP_PARSE_H +#include + +#include "libavutil/channel_layout.h" + #include "get_bits.h" typedef struct MLPHeaderInfo From patchwork Fri May 21 18:00:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 27893 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp744443iof; Fri, 21 May 2021 11:03:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxBB4O5rB8aVOoYIW3iUITzGaYBG4x/LpfXTeacqU/a2zYh2YpP7e/8Vv14Xu7HvJKHmOKq X-Received: by 2002:a17:907:1b02:: with SMTP id mp2mr11254155ejc.196.1621620195543; Fri, 21 May 2021 11:03:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621620195; cv=none; d=google.com; s=arc-20160816; b=bURmeA2tg1Wh7e2gkhglLgSSJsx/1s3iIv2t7GLnkDY1XuvJE0NKggcY/Xz/bO5iI5 agbob8ZFU/XfeE2lWkLMB5EYi+sp0q01MsCaXk79zdbqd1maPnXI2QlgcEiWpnrYtphP Pl3MOW6paDgs1k0JNL5JiAryKhtfM/qWxxou7Cwpaz2IkoDap/sDJB3ah5C07qz8MluM 8j0WKJYrBGCx6B2dd+H2CObsZFCh/oo3HaGRucx/3vt4jPiNrInm/0sneVPpcq7YWqPU x7tlwMnTX3clXpGBK6PAiXKyAsD44S4T6ghTKi2EgYWC92l8uvG+D1JXn5QJRZ61Pmmv yDBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=Gp+lxikSwAuGVSYzcyvIFLHVxSyuItqmcLXNB79BJlk=; b=qbzvSVPlbhYnxyCl3/YXl85uc1KHWkyYbiqo8kxldT9dSq1bldOqahjrFVB6pg1ysD 15JOKGS5x7s7NbUyuh46I/+/TbS/pNAEWJ9O/X821tI0oboF4+P42b5bRHMiQMxRBe0i 2yHjM2yQj43Bufh+21groWv7sdqoCs9L3IRovNBtutzUB0RT1hl58gxFb9M+yxlstkeX Irh8FOqyOhita0jOdZRechlBt6o0pGgv9SBCmpZHKzJX+sOtcRJ2B1tkPwAD9dAdBekK UyVIkbgIJnk/8FAZbHAUZkQsHSPrm+VGD/XJcg1h0bdAXF1OahxgQHIVZ4nUtXBmxa0+ A0qQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id dc6si5951193ejb.558.2021.05.21.11.03.13; Fri, 21 May 2021 11:03:15 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5C6AA689200; Fri, 21 May 2021 21:01:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7BF7868924E for ; Fri, 21 May 2021 21:01:18 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 2299C24069B for ; Fri, 21 May 2021 20:01:16 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id HcPIYuJ7ZNfD for ; Fri, 21 May 2021 20:01:15 +0200 (CEST) Received: from libav.khirnov.net (unknown [IPv6:2a00:c500:561:201:5fb8:4bfe:b578:641e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 0395C24069A for ; Fri, 21 May 2021 20:01:10 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id F0D463A1601; Fri, 21 May 2021 20:01:06 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 May 2021 20:00:43 +0200 Message-Id: <20210521180056.17496-12-anton@khirnov.net> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210521180056.17496-1-anton@khirnov.net> References: <20210521180056.17496-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 12/25] lavc/get_bits: avoid avcodec.h dependency X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: MOd/NFOf2Vb1 Include only defs.h, needed for AV_INPUT_BUFFER_PADDING_SIZE. --- libavcodec/get_bits.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h index 66fb877599..d4e9276da1 100644 --- a/libavcodec/get_bits.h +++ b/libavcodec/get_bits.h @@ -33,7 +33,8 @@ #include "libavutil/intreadwrite.h" #include "libavutil/log.h" #include "libavutil/avassert.h" -#include "avcodec.h" + +#include "defs.h" #include "mathops.h" #include "vlc.h" From patchwork Fri May 21 18:00:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 27913 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:bbc9:0:0:0:0:0 with SMTP id c9csp1183584ybk; Fri, 21 May 2021 11:04:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzaJo28tZH5q0MwqnaGYgL/te4r2vZTQdAG8INBOfmk1qHbaup0yqwmDoHObeTIdyzideIk X-Received: by 2002:a17:907:2dab:: with SMTP id gt43mr11821367ejc.369.1621620249108; Fri, 21 May 2021 11:04:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621620249; cv=none; d=google.com; s=arc-20160816; b=c78FzVHlnB1IP0nFo8AOf6Z9fT8eOTTnyHiiQXjiJuUbd3BuixNTCI6/Y1dRNbnoHr +a+3jEMJhs/hpGn0TcXTgBSqmeM6uNDIuBjvKgIPx880vnotYQjjSmlLpnqa3ApUWKPc 8dCOQD9SRu8ll1ZK5yfIXOvtN+Qf5YnNRKnJ9jfHY43SEoTliRvFyGKYakM18sCQXj1v PWcaKhNk9WvTlN0eUgZKmZspenf+V6SqlP7/jneZvOfmKcBe+F25V2L7UHihJ9/mmYvp xWBf9zxtSw7mi09gBx2sXNtz88crl/o+ZUb1jS0QuGgeHs1fbqPVaoZDYtKB05rp5Qsm a75w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=usJ8cEyU0GW3QrFidwQUWloXzGO0RxI3q+A76JODVRY=; b=Rt+5B6SRqAJ71cy5JesnPcy5P1cLlsIt6OUI+YeTanw0qIhiA0mXhE6pl2xel8GGLx HyxhLRLUxXxgpyCIKcPl+oFZc/iqvfpNXMDdbu4AvRxPUV9WowxAst+p2u6dptPMQwxp jne97hbg0Kpt0Nge4N8Q4cvJ2B88bnYGKj/pcrllvyz1TYKzSoo2C4d6j5iZvHGmGBxy ALQVtAjqa5ngtzrAvFL60s5v9lb9Dp90jJxCn7xEktb0a/IqN+3IBeQYpSRWDSSlb9mP j5qRI2jIZdzIc7NGLjcbfszo3CaPjSHYERcdbs21kOx5hwQD1/jE8AyCby/3irC/3zuO 1rFA== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r14si5751802edm.356.2021.05.21.11.04.08; Fri, 21 May 2021 11:04:09 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D06F5689DFA; Fri, 21 May 2021 21:01:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 926C6689993 for ; Fri, 21 May 2021 21:01:19 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 3344824042A for ; Fri, 21 May 2021 20:01:19 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id TOZkXGRC0Jtg for ; Fri, 21 May 2021 20:01:16 +0200 (CEST) Received: from libav.khirnov.net (unknown [IPv6:2a00:c500:561:201:5fb8:4bfe:b578:641e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 0914F24069C for ; Fri, 21 May 2021 20:01:10 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id 00A713A165F; Fri, 21 May 2021 20:01:06 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 May 2021 20:00:44 +0200 Message-Id: <20210521180056.17496-13-anton@khirnov.net> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210521180056.17496-1-anton@khirnov.net> References: <20210521180056.17496-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 13/25] lavfi/lavfutils: include required headers explicitly X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: zHnL+fsR4ViA Content-Length: 904 --- libavfilter/lavfutils.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libavfilter/lavfutils.c b/libavfilter/lavfutils.c index 2bc06257c6..9aa781ef7b 100644 --- a/libavfilter/lavfutils.c +++ b/libavfilter/lavfutils.c @@ -18,8 +18,17 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include + +#include "libavutil/dict.h" #include "libavutil/imgutils.h" +#include "libavutil/log.h" +#include "libavutil/pixfmt.h" + #include "libavformat/avformat.h" + +#include "libavcodec/avcodec.h" + #include "lavfutils.h" int ff_load_image(uint8_t *data[4], int linesize[4], From patchwork Fri May 21 18:00:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 27903 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp744296iof; Fri, 21 May 2021 11:03:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzYZ0Ll8c4qRknE2DPmophTH85mWL1Q2WZYHSz7thor7bTFNX+U+ADZf0Z4mOHi+iEJa9Y+ X-Received: by 2002:a17:906:6ad0:: with SMTP id q16mr11916623ejs.286.1621620186275; Fri, 21 May 2021 11:03:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621620186; cv=none; d=google.com; s=arc-20160816; b=NTlabrcUx8YVXA6RrUYW1/Ye+qxCfKVtrvvODyZhTtQsECjBIPYgOqyQp1cld5JSoO WAsauFHd6vLSxWctYK4SdlAp5XXhdMkRF1iH1zNhKRfDNjXJQU44F3uFQpSpSkDmJKJ8 72zjUvqxjWpCtGLM25ZnPvkIfxiKcGMVM6gTiu34AM29jsyVR5t75nr/vChdkf9wUYUj qAMHNtAh4EPYcSRyt00uuq/FbF/Q6BYts27kcBqWF5zsU41gQLx+W5mA1+6lwjQF6W0U /iBa/cbYL7lWGwNpjB7v2XB0DS2k6fgwX9wRojyy0BEJ2FQCACR5Ow6ggr7GfwLX5TEc iMww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=1+Zr3cq1zzSwfPpU0jTKwPlYEZbxHwkL2aX62Ou1SpI=; b=yQDthldJ8/ltDIv/sp/xIvYWE5XgmLlBFfEhKURmS2W7/E6bOrNqlMMfb5WFDq9Bo1 GEx3hIyf7lCSp2TwGc0r/cnRqGvyik2SF/eXR3EWMQa/r0s4gCpQPU2UbOQ6eRZpfNSa +/9S2MUlPD9AT1w+rKSIMBidjOHx/5hA7/wGgocyO2UBVPF1Cvux4sHjDqzEOLtJZd8g M70X5Ge4OLwEDIqB2UB0hgcI5Tdx5fqrHkHhrd/wc3VqExsvR+rQ4Dwb1Myf8aXVfY7X cBWzKXgRehbK2UaNWDJh/gMkVIFwTyZuJgZyW5RIrs01CEd+pSHmU7kwYydJ+N//FVEb 9w/w== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e12si6326863ejk.225.2021.05.21.11.03.03; Fri, 21 May 2021 11:03:06 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9BE7D689D21; Fri, 21 May 2021 21:01:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 790AD6891DE for ; Fri, 21 May 2021 21:01:18 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id AA9C8240696 for ; Fri, 21 May 2021 20:01:15 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id agWlDAzhbN3w for ; Fri, 21 May 2021 20:01:15 +0200 (CEST) Received: from libav.khirnov.net (unknown [IPv6:2a00:c500:561:201:5fb8:4bfe:b578:641e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 0397E24069B for ; Fri, 21 May 2021 20:01:10 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id 0485B3A1727; Fri, 21 May 2021 20:01:07 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 May 2021 20:00:45 +0200 Message-Id: <20210521180056.17496-14-anton@khirnov.net> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210521180056.17496-1-anton@khirnov.net> References: <20210521180056.17496-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 14/25] lavf/internal: include avcodec.h explicitly X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: CEbcQUUiT3t2 Do not depend on avformat.h to provide it. --- libavformat/internal.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/internal.h b/libavformat/internal.h index d57e63c1c2..f9abec9e44 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -24,6 +24,9 @@ #include #include "libavutil/bprint.h" + +#include "libavcodec/avcodec.h" + #include "avformat.h" #include "os_support.h" From patchwork Fri May 21 18:00:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 27901 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp743976iof; Fri, 21 May 2021 11:02:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwTGVgEl6jFR1e9XNjfYbveP2/F4YOdMC1Roi96b1BS6LGuB2vhltv8+eBX60yauTX/3zRZ X-Received: by 2002:a17:906:3989:: with SMTP id h9mr11535738eje.309.1621620163273; Fri, 21 May 2021 11:02:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621620163; cv=none; d=google.com; s=arc-20160816; b=G2TIjk8grRL+Vi/YsL3xhrEwIX1fN6/BHECeAUsXNMgJ8G+C+8soMSCktnOyJ8Cviu VMC61ofTT36Wq0XnwnNnyNpLzqEPuql2VHKZ7mc3AO/b7OcI6UAAXN5KEhVW6i0cwiAQ GKc5vkEt8Ps5Gao4FK7uZ3NCvpkgGaXQksZg1eUTn0d61t7TdwyQtRNzZU5zCx2xHPsM N+AuPlVvOHXqJrvQZTTyKyDr3Zrz7bu1VLouiHPsQxzTEdNFTf8DpC8LxtpciBG9L4yl scZoc+8nOKZoTYnQViMQ1cneROCK0pwNQTOYM3cXh94+yOuesbNXsCq3iKtUEZksHitq Tbhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=KAobcFtMKJyxJhw4vBViLkKZbSQPzVUZoYkr6ElBA/w=; b=qNdzJ4MAcNJ4Rj/aT2hcjcXtJP6X9p/4b77EyUfk8LhVrIpo2RDnkx7+q13kgwTk7H PCqPhHeMPtSDUKWZbtdBsWxk0IV9n6sp2cPXCYIsbmyFfVtAN5oo8gWkJnIbFFkzjnBl lyG0/vKGRQe/GRnPgKwXCz5BZ7nOEpWk4i9HFAUzSWroVik1plbXnvYPL4qAIkfTM7ld 3QAQ3EkMAbR1GIagtPo0kBR5AV9GzFGecYTwdChOf9fWrjxMnq7Cb19bhxzivXWJhN6c XGhOex4+esnJGsETQBUltLAADAGdoYfltJiaFy62zQZeN5Kl1d2BXL0hPNxhGEKdwlUl 2kTw== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a11si5575184edf.280.2021.05.21.11.02.42; Fri, 21 May 2021 11:02:43 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0BFA7689CDF; Fri, 21 May 2021 21:01:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4EFC56883DD for ; Fri, 21 May 2021 21:01:18 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id E6C1E240694 for ; Fri, 21 May 2021 20:01:14 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id eTBkNs1FeodM for ; Fri, 21 May 2021 20:01:14 +0200 (CEST) Received: from libav.khirnov.net (unknown [IPv6:2a00:c500:561:201:5fb8:4bfe:b578:641e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id D2ED4240698 for ; Fri, 21 May 2021 20:01:09 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id 0871E3A173A; Fri, 21 May 2021 20:01:07 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 May 2021 20:00:46 +0200 Message-Id: <20210521180056.17496-15-anton@khirnov.net> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210521180056.17496-1-anton@khirnov.net> References: <20210521180056.17496-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 15/25] lavf/icoenc: include required headers explicitly X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: iPvGVmuMBFJO --- libavformat/icoenc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/icoenc.c b/libavformat/icoenc.c index 39e92a41b7..a1ca15155f 100644 --- a/libavformat/icoenc.c +++ b/libavformat/icoenc.c @@ -26,6 +26,10 @@ #include "libavutil/intreadwrite.h" #include "libavutil/pixdesc.h" + +#include "libavcodec/codec_desc.h" +#include "libavcodec/codec_id.h" + #include "avformat.h" typedef struct { From patchwork Fri May 21 18:00:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 27898 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp744569iof; Fri, 21 May 2021 11:03:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxbIHBtIJ5cYdI3/4Jm/5zPcurQ/qAUwmANXb/rgjOEWOaPoxx2/Kih7Dlq0DupYWTZ1rYr X-Received: by 2002:aa7:dd41:: with SMTP id o1mr12219881edw.361.1621620206208; Fri, 21 May 2021 11:03:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621620206; cv=none; d=google.com; s=arc-20160816; b=pV6cCPJ79/ATlkpxXwkEEiN5DOSLp/m8+4u9LVFrOGwnwzSpaL+Rv9FXCL1T2RwxOG /7tqpy1WtKEMSM72KcE7agANmczwES+KxdZ5+Gpx31FwYw0yw+NzcXk9D1CAaOJ9OfiK 508Va0E4QJO7tYqv5faJuJDAkNvPKkccaWE/6V99xnooxTYiWfwr4NYz90dZiXAPYybU Fq3vJ0zsfv7jT0VZ97YvqrHk4IajIQP1dJ5EiviIs4QaiPM6O/yCva9QW9h6Cgs2SIT+ T3/hRX6nAaZzabJcmr/4BlUO9DFE4KjlSz5sMyDwfwGlRySzOgE3carCc4GFi2RkgMZ7 8bBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=/MpikRXqpgpR/akbwBIQeBrOxvYG+moPfLm7MACTV48=; b=rZlQP/UD5JRMqWV2NtWDY/lqOP432PDjKwAcDNFeC3wfzyuyJe1K3lCHiZt/lyc/gH +Fbsc+y7qPmg5g9tX8YkC0Cs/JsN7HgBUIbdj0UsCCZE+UtL4lt66Jw68c4IoTSGYEfv a01uCwnKebGyQtSVKChLrUoBWP8T99RoxLXmRMHcVvfHJbIkV+5adrL5vMxPGKCakHsU eF8iaZo3/ef1s6ICdGhCxLTv8MBO0ZQgCNHBvF+EdkkaSNcBoxjnhz9iNwYE3c8At9r/ Ov9XkIWUaD2jSRVgWor7qpwkZX/92GgAIGAuYoTVpRsCx70y2KVo/wioDx43NNHdO0Dl JIxA== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id jz1si6228829ejb.461.2021.05.21.11.03.24; Fri, 21 May 2021 11:03:26 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 28BCA689966; Fri, 21 May 2021 21:01:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7E98568993B for ; Fri, 21 May 2021 21:01:18 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 05193240699 for ; Fri, 21 May 2021 20:01:17 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id t-W4pp8nEm1e for ; Fri, 21 May 2021 20:01:16 +0200 (CEST) Received: from libav.khirnov.net (unknown [IPv6:2a00:c500:561:201:5fb8:4bfe:b578:641e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 2A26624069D for ; Fri, 21 May 2021 20:01:10 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id 0C66F3A177F; Fri, 21 May 2021 20:01:07 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 May 2021 20:00:47 +0200 Message-Id: <20210521180056.17496-16-anton@khirnov.net> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210521180056.17496-1-anton@khirnov.net> References: <20210521180056.17496-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 16/25] lavf/avformat.h: drop the avcodec.h include X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: kXGjDtVyxcR8 Since AVStream.codec is gone, avformat.h does not require anything from avcodec.h. --- libavformat/avformat.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index a28ac372da..92807e9657 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -309,7 +309,12 @@ #include #include /* FILE */ -#include "libavcodec/avcodec.h" + +#include "libavcodec/codec.h" +#include "libavcodec/codec_par.h" +#include "libavcodec/defs.h" +#include "libavcodec/packet.h" + #include "libavutil/dict.h" #include "libavutil/log.h" From patchwork Fri May 21 18:00:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 27897 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp744975iof; Fri, 21 May 2021 11:03:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJynIlhBeJGdIfWEcEkTi5thZFhMqwbg0YivK7h+ze7nKfGSgVf2GCAVcnKF9Y+6jRguV8yw X-Received: by 2002:aa7:cb92:: with SMTP id r18mr12609549edt.246.1621620239375; Fri, 21 May 2021 11:03:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621620239; cv=none; d=google.com; s=arc-20160816; b=IwCGKohGhVVHHXCeTpmYr7VNhyRnMRYWm9G/Q2mnICxTDIUDk47/nRlbUu7tA/GNUX U5F2qptESL0uxfI5ePySk0lw9z8Zbxp9MSzFYk9thKUYHOl86v55jgURHaNFqmhGPifZ l0bUnsMOV5UhwJwL/cNPFim92IixSVfY3KGVU5Gn4lZUb5UlXsYO3NSPWP3U/CjQcwgl RP97DkUcXJhM3X4O7WJKtsjfe4VT9xYR6zjUsDSuMULbtfQq5SMerHOCs3U9tsxZBDih vO4ANwyKZsyDfKNjuqglQ6hoIEpFtWbmn5jrsNJfN1RugYNHgraXgLXJFVHxfxkeyJdm /8ng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=eX5+jdFXRNKJycRLCYXFLBebcst1glIhqqHlgWNZAWI=; b=doFQxweqN+Su0rkBQQql8K0Eke1aplwUDN7ek81v4pdO5NpLmr2i7JtCTxNc+PI8Dw t3bOSTVdz13awwGjvm6q+4SbgSf35/WSx081Ahe1a01mxopQxEDgRNtGc7YpQoWFIbDW MQMX0aY+ZkHOw4FeYLFvy396xcdYaYSvqg9MTS3PerVIwhYdtEldrVzmv9r9PhgvVU6r t7VFvJwmdeK2kBIQlxzyQrSBddvN+G+6DdA8rJuOAe3Lw3LTfpxqh1mcPO8oXsWvhTDm qpoBOCIdqaUrkJBVAKNcLdRuu1KEJ2dJbdQlMhcPK6IfShC21BWwpBgNH+Esu/y2iwfM dI8w== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l6si1509253edt.207.2021.05.21.11.03.59; Fri, 21 May 2021 11:03:59 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B8D9E689A4E; Fri, 21 May 2021 21:01:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9D4886891DE for ; Fri, 21 May 2021 21:01:18 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 0B29824042A for ; Fri, 21 May 2021 20:01:18 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id Vu9dbDf6CRvQ for ; Fri, 21 May 2021 20:01:17 +0200 (CEST) Received: from libav.khirnov.net (unknown [IPv6:2a00:c500:561:201:5fb8:4bfe:b578:641e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 2B26824069E for ; Fri, 21 May 2021 20:01:10 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id 107813A178D; Fri, 21 May 2021 20:01:07 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 May 2021 20:00:48 +0200 Message-Id: <20210521180056.17496-17-anton@khirnov.net> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210521180056.17496-1-anton@khirnov.net> References: <20210521180056.17496-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 17/25] lavf/a64: avoid avcodec.h dependency X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: SDBwUrzrnSAY --- libavformat/a64.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/a64.c b/libavformat/a64.c index e6018f06d3..6e19162fe2 100644 --- a/libavformat/a64.c +++ b/libavformat/a64.c @@ -19,7 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavcodec/avcodec.h" +#include "libavcodec/codec_id.h" +#include "libavcodec/codec_par.h" #include "libavcodec/bytestream.h" #include "avformat.h" #include "rawenc.h" From patchwork Fri May 21 18:00:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 27914 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:bbc9:0:0:0:0:0 with SMTP id c9csp1183893ybk; Fri, 21 May 2021 11:04:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwadIgOAr9cahaRm3QdFH4Sm7J5Vm3Plcvkocxn0pEyngMa3DpSbvYxmLIOexabkljqoxcg X-Received: by 2002:a05:6402:424c:: with SMTP id g12mr8576863edb.145.1621620269333; Fri, 21 May 2021 11:04:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621620269; cv=none; d=google.com; s=arc-20160816; b=qjIktCvFGlDgfS872txyAP0CNOfynAVoguGb5NHo5i5x2swEKh8Jq+8N2xJszCzSli 1QbfXCywFN73BFHG6IcV3kW4Oz9Ew0KQCcPUcuBPRK2bjDhlJ9bOOPp5f5Nqw8OFCSm+ VofI6EmOm8GD8hy8PiEDaqP1gRbg4sPUtQj/LMo1LwJ+GbwiyUc5taKiXs5IPktGX4LZ 1xZ+L4DMzL+PnJgncKXMMNMigz9eciR9VTRYxK4gYkUCJMXaPN1sLYeid/VBTQ0CNgQB 3cqthPBZMxgxdzGFOobOM9LrS1UAEtr6b1oCcAo+aVu6GzZ9Mi/6ts7KkEZthuSKYEGs Oz7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=YnkfTmuxI9t2xq/rnMziD/fEjlfNnfdg032twTcTVFg=; b=yTflFYqX0SnsZuyVBarFAiymaRyQcQpP7+/rhUtenCD17n87qolbmsV5KQQmCDkyye v4Q87fOj8uMgGtcoQPBNDtvRvgQ1+mwEdW6g87t3otDtMlUtqUSIHWEoJCFPAALQcou4 d0J8/nB7BuSWjfl2EfiU82aFsvyNIBNExJ9T3PIyObf4dFlYwe9xq+wilCSzgZyjyX6y hX5lGfdmQNqQUNomp1hI/pI/172cvAip4E7c53keA4vqzZdw0QRe8t3hwr8MnxoymAIC IwNdzYNyMM9M6zOsei0Weoh8pTy06bBQms506qfu8sfxC5WmNUfW28V8kNZVX/mhqFrV sH4w== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n16si1157506ejb.559.2021.05.21.11.04.29; Fri, 21 May 2021 11:04:29 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9A14A689E85; Fri, 21 May 2021 21:01:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4AE8C6899B1 for ; Fri, 21 May 2021 21:01:20 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id F34F924042A for ; Fri, 21 May 2021 20:01:19 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id gVJDu__Y7c8K for ; Fri, 21 May 2021 20:01:19 +0200 (CEST) Received: from libav.khirnov.net (unknown [IPv6:2a00:c500:561:201:5fb8:4bfe:b578:641e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 3380E2406A1 for ; Fri, 21 May 2021 20:01:10 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id 1483D3A1844; Fri, 21 May 2021 20:01:07 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 May 2021 20:00:49 +0200 Message-Id: <20210521180056.17496-18-anton@khirnov.net> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210521180056.17496-1-anton@khirnov.net> References: <20210521180056.17496-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 18/25] lavf/adtsenc: avoid avcodec.h dependency X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: bUD/qgjFrqsE Content-Length: 808 --- libavformat/adtsenc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/adtsenc.c b/libavformat/adtsenc.c index 96caf9950e..ba15c0a724 100644 --- a/libavformat/adtsenc.c +++ b/libavformat/adtsenc.c @@ -22,7 +22,9 @@ #include "libavcodec/get_bits.h" #include "libavcodec/put_bits.h" -#include "libavcodec/avcodec.h" +#include "libavcodec/codec_id.h" +#include "libavcodec/codec_par.h" +#include "libavcodec/packet.h" #include "libavcodec/mpeg4audio.h" #include "libavutil/opt.h" #include "avformat.h" From patchwork Fri May 21 18:00:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 27896 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp744854iof; Fri, 21 May 2021 11:03:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz+ByMJw69EYtL7h32Mk3vdhax+oZjnLKnsFt1Cg7oCwdt1EVzOFGKLJRnX8O19X+zKd1lH X-Received: by 2002:aa7:d598:: with SMTP id r24mr12748762edq.250.1621620228955; Fri, 21 May 2021 11:03:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621620228; cv=none; d=google.com; s=arc-20160816; b=eERC5c62N+/rbaqCnPHGgFli8tkNz//9CSv8sJJRo6MsLcwGvUGmjkQTgYZail84i5 EiTjNfdiC+0NnxwOhmtUdzT4ekdJLgDBYfw9syxsA1xU7eSbCQRBEM79mGIn2f+K6BHe e9J7tMmucygAqbkJrXiEKvDPFcNdILhz3yiPMxWztYxul8WhvVUuPbSNbcPZkU0JZVm3 DhBm4fAFEVFqJV1/2xZAQhJ96iKT+GcplPOL37VYx+TW2gJZhQjuUaztZwBB0XYUftYE zpM+XjRf2ZcV5MRxceHHJ/kRQfd9rWFXVNA67+b+MhxpzcUFkEgBuEMBiZ5aDDPfsi+J 2+cA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=Es4uR6xnq/WOlkCJdyU5kAwZrTN7kHoUqzPPRY/N998=; b=sgGBtixVd06Y8H+tO4UL97inDNCOqDShO+8fn4lsB/LpXp1RUCobjPKRAizv/Db26/ 7MlXvbqOa1MFyEEtStdBagHDeJ4XDCB+tp6TMVtOy9yG2cqoFopJU/R3QaSqsQvh/2rn m05FXHlKksDBR3pHrmZSQqalL1MrBDmXB+5vZ2Su9GmtLJn3GN+l6ZbxEl4SU6+AxXBX qNy/rmOFS108HX3vl9U2QUa7WwS1HiFliLgGY8HrreU+vm0TPNCj3PHBoCnA+KqBsq9W +5ix+G4HIlsZq1I1ofEvPrBMWsaspsPBOfHdV+qXWidSdLw1bXw6fnJhvD9Mk6lFqPxa bU2g== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e14si4646764edz.297.2021.05.21.11.03.47; Fri, 21 May 2021 11:03:48 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E5231689DAB; Fri, 21 May 2021 21:01:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 821B4680725 for ; Fri, 21 May 2021 21:01:18 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 8623924069D for ; Fri, 21 May 2021 20:01:17 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id XFVxYYiH9P6Q for ; Fri, 21 May 2021 20:01:17 +0200 (CEST) Received: from libav.khirnov.net (unknown [IPv6:2a00:c500:561:201:5fb8:4bfe:b578:641e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 2BFB524069F for ; Fri, 21 May 2021 20:01:10 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id 184813A1853; Fri, 21 May 2021 20:01:07 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 May 2021 20:00:50 +0200 Message-Id: <20210521180056.17496-19-anton@khirnov.net> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210521180056.17496-1-anton@khirnov.net> References: <20210521180056.17496-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 19/25] lavf/framecrcenc: avoid avcodec.h dependency X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: HJqo+PBK+PSm --- libavformat/framecrcenc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavformat/framecrcenc.c b/libavformat/framecrcenc.c index c300702d55..56f7ea1b5a 100644 --- a/libavformat/framecrcenc.c +++ b/libavformat/framecrcenc.c @@ -22,7 +22,11 @@ #include #include "libavutil/adler32.h" -#include "libavcodec/avcodec.h" + +#include "libavcodec/codec_id.h" +#include "libavcodec/codec_par.h" +#include "libavcodec/packet.h" + #include "avformat.h" #include "internal.h" From patchwork Fri May 21 18:00:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 27910 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp745897iof; Fri, 21 May 2021 11:05:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyiWB0pPb7SZ+cvMYQhXD16J3sVn9F1FVHbdCRkklY4i3AqM1tBnvo9yCv6kD8Au7De/IgV X-Received: by 2002:a17:906:c9d8:: with SMTP id hk24mr11667441ejb.480.1621620311057; Fri, 21 May 2021 11:05:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621620311; cv=none; d=google.com; s=arc-20160816; b=DVf7kwVt+Yq5ACGL3Jc1B9ZXujNzW0clen9dS5BYw0gY3GIgsDGkl9P5+0OWLknjWU wtvd1yFn3FAoT4FxMRbcHDX6R1GDM0JqlqMYCd5OS9QgsfVigKylQtCtCmFvk186cyYs snkIU/ZCKwWQjvaC7b1CbBkjRKuKAxnqv0o+hIxAz019MkdkgxhvqwktltgAjNIGJYqM D4xGSnPTS+1pbthyYBt2fjAWeOpY+cwajC6KkOZSt6XZjdIRxLY+lW9Bv9rBeywgvnfO sYhUsWA+M5gF1vE7AmGPNCW+C/uIN20p1oHpIllS2LguaeAsPDTEUpgMPrZmFn9H+oEW E4MA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=LXhvLzIh5l+7rV6l7ZlowMrew4Tt3nPIiUssRnDKE6k=; b=upbWzKtO/rLHUixBsB6sGpUpWlLzDES2NbHibEl7XtZIm2Hi9RbgemsV4wlAvV9Are /zFptpnGkxAT1N/oR3roq7A7Z7RP/SKqimbTMirmUD4B1GkTtdcEMm97TTiBhH0orTaJ +xIpJ9aXf/z+i0+xtzZsyaYE3DESXERFXkAzZ7v2/mVQXACiJvkQzv4LcFOEgHgC5tmr d0g/if4rIp3QaIY8gIg+Y//LTR3zedLn89xP0C1uC2J25CRmSr93Fre4vzwHU5naZ0yJ QxUylDnUsfHAUiCqRd8dOo+L5bYC8PiLQlzDxCpXg+5LRye9XSPbt5y7xjKgLnpuynEd YNHg== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e6si6719500edz.503.2021.05.21.11.05.10; Fri, 21 May 2021 11:05:11 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AA5C7689F20; Fri, 21 May 2021 21:01:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 15C746881F1 for ; Fri, 21 May 2021 21:01:21 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id C35C3240477 for ; Fri, 21 May 2021 20:01:20 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id 6cb1_W4JC64Y for ; Fri, 21 May 2021 20:01:20 +0200 (CEST) Received: from libav.khirnov.net (unknown [IPv6:2a00:c500:561:201:5fb8:4bfe:b578:641e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 3384F2406A3 for ; Fri, 21 May 2021 20:01:10 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id 1C2953A189A; Fri, 21 May 2021 20:01:07 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 May 2021 20:00:51 +0200 Message-Id: <20210521180056.17496-20-anton@khirnov.net> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210521180056.17496-1-anton@khirnov.net> References: <20210521180056.17496-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 20/25] lavf/hevc: drop unnecessary avcodec.h include X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: YuU/WizeGzSa --- libavformat/hevc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavformat/hevc.c b/libavformat/hevc.c index 94eb3a9cb1..df141aec26 100644 --- a/libavformat/hevc.c +++ b/libavformat/hevc.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavcodec/avcodec.h" #include "libavcodec/get_bits.h" #include "libavcodec/golomb.h" #include "libavcodec/hevc.h" From patchwork Fri May 21 18:00:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 27916 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:bbc9:0:0:0:0:0 with SMTP id c9csp1183997ybk; Fri, 21 May 2021 11:04:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJynUndsdwGC+D0t+YZL/EaxXLCqWD1KNYpHLNSgDJhXZFyKSQjncnX5wX4j34AMInEL8HeR X-Received: by 2002:aa7:d4ca:: with SMTP id t10mr12622780edr.42.1621620277619; Fri, 21 May 2021 11:04:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621620277; cv=none; d=google.com; s=arc-20160816; b=JghX8GvPPpTo0I3RJ4lkC8elmaOxHbYMk6n+jTrVW6xu4P5RFabSRxsvcFhJAqrtud YdtgRYQ2oxFXoM3ucbiK5F7WQISocCBD2JqH40mg4Is6/mlDY/12ijosrDRQw/ihOehm cK8tg0MjZDPonXEK4uTjCj5VXvLwC+6ywz2/Jd/ZflvKAeZELwUjBTpAUV5RKkzy0roT g0wooXwU9QaBYM4PDll87YANxlW4ZgGqoURXj8xcBrC0RXUHlfJh3VZYjBCQ9rDdW/Gv eY7nsOnFYwOj20cOfash2Z21GR22Wp3HfvPUDdhnMEcYUK8bufbxsjw7FkqkRV07E2GJ dxlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=Xr4y/PGj3q2BoqpY4NEiSbSBRSaVBudugDbWZYr/o/I=; b=r3Q8Yv3v92ANQ2aVw0Ey119Xbhe89frxqQeBd3jilKOnOZjlaN5YOMAEUUBi5L622f bQkiFx3Gt0LB8wA6x7cljLEdv6EbJEut+u6u80IYT0be3gKR+IgycCI//yDbj2/ig2a5 JiqP4u1WtJqYaO1OpUv5kZxALc6xM1KkT9yxXBQUUIiebI6EENqAVByvaps86XqmoOvv 1or9Al6VJ3IZY7MLbEg0Uwi7oDPLutuTrxKXVk73IWlu+lfCaXRIHUhC4zHBBeu3v96y cu4OedPTidWyN4kgDTQ4jReMnQL3LzArj+wEWnOQN2icbwX1gVIxaeZz3Rhs+NQio0o2 GAow== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ah12si6205983ejc.252.2021.05.21.11.04.37; Fri, 21 May 2021 11:04:37 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2558E689E94; Fri, 21 May 2021 21:01:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7E8E26880D3 for ; Fri, 21 May 2021 21:01:20 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 2DF6B240477 for ; Fri, 21 May 2021 20:01:20 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id vZh_PeLPUYIr for ; Fri, 21 May 2021 20:01:18 +0200 (CEST) Received: from libav.khirnov.net (unknown [IPv6:2a00:c500:561:201:5fb8:4bfe:b578:641e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 2D1702406A0 for ; Fri, 21 May 2021 20:01:10 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id 201283A18C1; Fri, 21 May 2021 20:01:07 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 May 2021 20:00:52 +0200 Message-Id: <20210521180056.17496-21-anton@khirnov.net> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210521180056.17496-1-anton@khirnov.net> References: <20210521180056.17496-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 21/25] lavf/id3v1: drop unnecessary avcodec.h include X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 27rHnYtZqsW1 Content-Length: 628 --- libavformat/id3v1.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavformat/id3v1.c b/libavformat/id3v1.c index eb66098f51..3189a48b8c 100644 --- a/libavformat/id3v1.c +++ b/libavformat/id3v1.c @@ -20,7 +20,6 @@ */ #include "id3v1.h" -#include "libavcodec/avcodec.h" #include "libavutil/dict.h" /* See Genre List at http://id3.org/id3v2.3.0 */ From patchwork Fri May 21 18:00:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 27919 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:bbc9:0:0:0:0:0 with SMTP id c9csp1184306ybk; Fri, 21 May 2021 11:04:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy2xao3lT2fSm5JHR4cZIcnSPNyO7ckAVp9+9eW8gY+BHA92UsVuXtK+DjMQ/jqrBocxTzi X-Received: by 2002:a17:906:4088:: with SMTP id u8mr11418061ejj.240.1621620297864; Fri, 21 May 2021 11:04:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621620297; cv=none; d=google.com; s=arc-20160816; b=TLdFOm/wfv3JWLKqoA6A07K87MfCDaCzxdw1Q3/6lUppMXrChZs1ERxPigIF+8A2Qx 4PeJfoNnOB9YS7xqv1xyh2i946r/TM5egs85W3927tH07QXmWiCaY1/H2zIPYHTqfl39 hR26Du+A/fCrHaZMBusmln2eNfJ0uikblGTJUtXLXzcqmJhwmgBtordLjW7QAAkk51RB RADoHmpOfyPbmMqCHNjEMO8Y9LyOTq4TMf3hGIjndDjFUgEQv1FSQkGmxADGr3FjpOlp vYvFKbJnh1G6c/J7ZzyAou3GitgTN8n+wZxOcI5UrHbDAMyisoLBAKuwxmS1xlrjOvhC A0zw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=qAf4oojjP5m6K4ZDpOqcoiKjTCyJ7oJz3VIwA+8vSk4=; b=IFWpTybIfxKQrsA3qM/oiNYA3UhrXkoE32OYNOM+r79myG8IgTALAY+5IQ9Og53ivy rGmNvExEDqUP+Kc3LSxTNbhfLeI+jL/Fkj9kh6kxhapcguZYAo1CyjHyJtCAEobhVzG7 KLxTdl4+5tw+Sift7/9fsClVRnvjkiDRsgyPxopJ8gSLSNvno/kExot9GhUXOyoJcAH2 nPa4V07mw30RmoHkrIQG2WqkkvLdBe5g8184zI2OphzTYXl1Q2ik8enF12pK8hewlkSu 0or3Dgc9o1oclNMrocsSyRF8oEQ6mSsxlEGpWEtH8gsX3gbdpclcmFBkFGNOI6A6TLx5 KvXg== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id bh4si7452646ejb.56.2021.05.21.11.04.57; Fri, 21 May 2021 11:04:57 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5E79C689EC9; Fri, 21 May 2021 21:01:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DBB2D6881F1 for ; Fri, 21 May 2021 21:01:20 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 8991B24042A for ; Fri, 21 May 2021 20:01:20 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id vGtrW22HjeUu for ; Fri, 21 May 2021 20:01:20 +0200 (CEST) Received: from libav.khirnov.net (unknown [IPv6:2a00:c500:561:201:5fb8:4bfe:b578:641e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 3389A2406A4 for ; Fri, 21 May 2021 20:01:10 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id 23C7E3A18DA; Fri, 21 May 2021 20:01:07 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 May 2021 20:00:53 +0200 Message-Id: <20210521180056.17496-22-anton@khirnov.net> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210521180056.17496-1-anton@khirnov.net> References: <20210521180056.17496-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 22/25] lavf/latmenc: avoid avcodec.h dependency X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: bqfB4Yyt02u3 Content-Length: 808 --- libavformat/latmenc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/latmenc.c b/libavformat/latmenc.c index 87a6b81798..21bb614f67 100644 --- a/libavformat/latmenc.c +++ b/libavformat/latmenc.c @@ -21,7 +21,9 @@ #include "libavcodec/get_bits.h" #include "libavcodec/put_bits.h" -#include "libavcodec/avcodec.h" +#include "libavcodec/codec_id.h" +#include "libavcodec/codec_par.h" +#include "libavcodec/packet.h" #include "libavcodec/mpeg4audio.h" #include "libavutil/opt.h" #include "avformat.h" From patchwork Fri May 21 18:00:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 27917 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:bbc9:0:0:0:0:0 with SMTP id c9csp1183707ybk; Fri, 21 May 2021 11:04:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxMULvrv/HActhK9yqJAx/oG5U/p/hLNHNV/vwYeRWjspCDMYhBxOu4YupOms4Mi+43Uw0t X-Received: by 2002:a05:6402:1582:: with SMTP id c2mr12443251edv.388.1621620256160; Fri, 21 May 2021 11:04:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621620256; cv=none; d=google.com; s=arc-20160816; b=rnjGL/XeM2XHNytAcJsmkVRVacv7Sedp29N9MBuhBE6EmzdIU7Cd6qlHl39wn932tj xiLrvSfzpfMDJMDReEwkG7QWPxi49/yJ93pukiN34e4b4tJpxWInP99mV+LXuh22Sp89 RrbP/LmawferFIk5OPWZ0yXKnuEkav82OOOm8172mmvNyjjEbsY5ejk8LjJXMhhqtIr3 3iFAxhJmTnWPyHQk1ua/7+I8wbVBpuZi79ThLXMPqoI+Zg2wCY3O16BrfhZV+wcMq7e/ BjDKYHxMcBWXywQEyp+LWDRDjQ0ySk4exawQD3+cLbgkqfZEIPzCmm4sqYmAjQTXvHOw NsMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=OLcNJ7xO20lZHOhr93vqtyvz/8zXyvQde7Ib7gonO+o=; b=wVmYZ+B0urocVevaGSVPSGNA6F5h3TQDSnD7WTWuNRn/e++mtf9hb8cjtOv+Q9Fnam EDZUR5JOVrwBHXutDTnJndxCg4++rWNJu1VZ+sEDuYRFcgdwlo19aVXMAVbuT93ZJtOs SGFO1L0hXCWWoQhsqn8/Meed9IKka9fj9XJcKTHtUkhAoqf3vkEyKHsKbcqVA4H5QyJT IbFjDhMk0jnHfgGzw5K9o0mVEC1GRHvjT5Ro87bpjdYRA+Eq1zFCJWbxO7qk8qCtvAHt BgUcplqacTENE9MoSOTHRCtAlcdCQzU8ZuAOrtRrCNQ4RqPQsvHzbV//sLoeY0yY7ncG d9zQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t18si5480135edr.386.2021.05.21.11.04.15; Fri, 21 May 2021 11:04:16 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4E48F689E50; Fri, 21 May 2021 21:01:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D8BFF689993 for ; Fri, 21 May 2021 21:01:19 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 91C0E240477 for ; Fri, 21 May 2021 20:01:19 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id 7zmdmC4aa6X7 for ; Fri, 21 May 2021 20:01:19 +0200 (CEST) Received: from libav.khirnov.net (unknown [IPv6:2a00:c500:561:201:5fb8:4bfe:b578:641e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 338322406A2 for ; Fri, 21 May 2021 20:01:10 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id 27CAA3A1901; Fri, 21 May 2021 20:01:07 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 May 2021 20:00:54 +0200 Message-Id: <20210521180056.17496-23-anton@khirnov.net> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210521180056.17496-1-anton@khirnov.net> References: <20210521180056.17496-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 23/25] lavc/matroska: avoid avcodec.h dependency X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 7wDeA4hfswab Content-Length: 694 --- libavformat/matroska.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/matroska.h b/libavformat/matroska.h index 30cbe18a8b..2d04a6838b 100644 --- a/libavformat/matroska.h +++ b/libavformat/matroska.h @@ -22,7 +22,7 @@ #ifndef AVFORMAT_MATROSKA_H #define AVFORMAT_MATROSKA_H -#include "libavcodec/avcodec.h" +#include "libavcodec/codec_id.h" #include "metadata.h" #include "internal.h" From patchwork Fri May 21 18:00:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 27911 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp746035iof; Fri, 21 May 2021 11:05:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzRIJ2lk/W8PJGegaZJIHAZLnMEvFWXVaWkormm27uTsLqAV7lQDFuvn5dJh9OjSJciWe0h X-Received: by 2002:a05:6402:188:: with SMTP id r8mr12416214edv.75.1621620321505; Fri, 21 May 2021 11:05:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621620321; cv=none; d=google.com; s=arc-20160816; b=reWezhmDePdlyIkCTKJpPhsd4oujmemRKtkbaQvhGZ9yEHUI3HZf0+m6eMGzZBxyc/ 0vZKjnqDcHtB2bst7WUDrjF/g2XS9OJQXtoOovPmIBvXjrEXBSU116QXSI7QiuU9wUDO IQ/9o8r4ChP/vV+zFAoiSJxGEaJ5jSFuivU1qLw/wMHHT0eub22jKM/BHnv2PQ7mUpQ/ DIy5h0JmPXX8nmeayEeLuPRw8yiY/lzr9AtBeUpA4ZaRTdE9bm7DJyFm6vpQd8mpIoJl K63PXuEERGASXEmQKS32YV0YGGaSTxLcCIPAB+HzONZdmCtskLTNVkf6lzP0pjkioSHa Fesw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=vR2Dhrj6oGIM2uUdmOKChzxxM1tQ/dV12tXnT8pUfNw=; b=WO/GgBMhsSXiuIJMIefjGrMmE4ZcwcODAC7EFFhcjOHb79VYvKx7H9Y6aImTwE9PH0 2nudWXRdP/PQgocvUkPrQZlSaxdRQnKQwvwYePRrow53kXZPM4+LVwpDuz6GUHZeEQgm gHYxtmAeToHVc7rl0ye34vUgd9iAaKxNw8FE8/WE6NlpWGYq0zwoUrFIYch6Xzy0vpAT aApAhHJfBhVBhZwCK+snzC4HtU+Ek+udFOt5npGT6+vptLBnaAYVBB4S1LeVW/R5Kafh 63xIuCPYq7gAbDXTxQfW5bGCSiC6EZ7pi0XAsQQa0awWfER9i8AMOB121cVY8A3pEAs8 1OCg== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e20si5670310eds.560.2021.05.21.11.05.21; Fri, 21 May 2021 11:05:21 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8AE5F689F3A; Fri, 21 May 2021 21:01:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4D0186881F1 for ; Fri, 21 May 2021 21:01:21 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id ECB3A24042A for ; Fri, 21 May 2021 20:01:20 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id MZWhuB3u3-pj for ; Fri, 21 May 2021 20:01:20 +0200 (CEST) Received: from libav.khirnov.net (unknown [IPv6:2a00:c500:561:201:5fb8:4bfe:b578:641e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 34CED2406A6 for ; Fri, 21 May 2021 20:01:10 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id 2BA343A1908; Fri, 21 May 2021 20:01:07 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 May 2021 20:00:55 +0200 Message-Id: <20210521180056.17496-24-anton@khirnov.net> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210521180056.17496-1-anton@khirnov.net> References: <20210521180056.17496-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 24/25] lavc/mov_chan: avoid avcodec.h dependency X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: pWv4fJSNMh5l --- libavformat/mov_chan.c | 2 +- libavformat/mov_chan.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/mov_chan.c b/libavformat/mov_chan.c index 324dd5f913..4ec16f15c2 100644 --- a/libavformat/mov_chan.c +++ b/libavformat/mov_chan.c @@ -26,7 +26,7 @@ #include #include "libavutil/channel_layout.h" -#include "libavcodec/avcodec.h" +#include "libavcodec/codec_id.h" #include "mov_chan.h" /** diff --git a/libavformat/mov_chan.h b/libavformat/mov_chan.h index ca28345aef..978b8a3732 100644 --- a/libavformat/mov_chan.h +++ b/libavformat/mov_chan.h @@ -28,7 +28,7 @@ #include -#include "libavcodec/avcodec.h" +#include "libavcodec/codec_id.h" #include "avformat.h" /**