From patchwork Fri Apr 10 15:42:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 18813 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 5E5BB44A415 for ; Fri, 10 Apr 2020 18:42:25 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4294E68B549; Fri, 10 Apr 2020 18:42:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.red.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F387168B319 for ; Fri, 10 Apr 2020 18:42:16 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail.red.khirnov.net (Postfix) with ESMTP id 57FE02883BE for ; Fri, 10 Apr 2020 17:42:16 +0200 (CEST) Received: from mail.red.khirnov.net ([IPv6:::1]) by localhost (mail.red.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id nLeFGQLGK-in for ; Fri, 10 Apr 2020 17:42:15 +0200 (CEST) Received: from quelana.khirnov.net (unknown [IPv6:2002:b061:f0a:201:5e:e696:5100:0]) (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 "quelana.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail.red.khirnov.net (Postfix) with ESMTPS id 6DA212883B9 for ; Fri, 10 Apr 2020 17:42:15 +0200 (CEST) Received: from localhost (quelana.khirnov.net [IPv6:::1]) by quelana.khirnov.net (Postfix) with ESMTP id 672892182C for ; Fri, 10 Apr 2020 17:42:14 +0200 (CEST) Received: from quelana.khirnov.net ([IPv6:::1]) by localhost (quelana.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id 4FsXK11tjI_Y for ; Fri, 10 Apr 2020 17:42:10 +0200 (CEST) Received: from libav.daenerys.khirnov.net (libav.daenerys.khirnov.net [IPv6:2a00:c500:561:201::7]) by quelana.khirnov.net (Postfix) with ESMTP id CA62A21200 for ; Fri, 10 Apr 2020 17:42:10 +0200 (CEST) Received: by libav.daenerys.khirnov.net (Postfix, from userid 1000) id 2E9AD20E004C; Fri, 10 Apr 2020 17:42:05 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 Apr 2020 17:42:00 +0200 Message-Id: <20200410154201.22678-3-anton@khirnov.net> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200410154201.22678-1-anton@khirnov.net> References: <20200410154201.22678-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] lavc: rename bsf.h to bsf_internal.h X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This will allow adding a public header named bsf.h --- libavcodec/aac_adtstoasc_bsf.c | 2 +- libavcodec/av1_frame_merge_bsf.c | 2 +- libavcodec/av1_frame_split_bsf.c | 2 +- libavcodec/av1_metadata_bsf.c | 2 +- libavcodec/bitstream_filters.c | 2 +- libavcodec/bsf.c | 2 +- libavcodec/{bsf.h => bsf_internal.h} | 6 +++--- libavcodec/chomp_bsf.c | 2 +- libavcodec/dca_core_bsf.c | 2 +- libavcodec/dump_extradata_bsf.c | 2 +- libavcodec/eac3_core_bsf.c | 2 +- libavcodec/extract_extradata_bsf.c | 2 +- libavcodec/filter_units_bsf.c | 2 +- libavcodec/h264_metadata_bsf.c | 2 +- libavcodec/h264_mp4toannexb_bsf.c | 2 +- libavcodec/h264_redundant_pps_bsf.c | 2 +- libavcodec/h265_metadata_bsf.c | 2 +- libavcodec/hapqa_extract_bsf.c | 2 +- libavcodec/hevc_mp4toannexb_bsf.c | 2 +- libavcodec/imx_dump_header_bsf.c | 2 +- libavcodec/mjpeg2jpeg_bsf.c | 2 +- libavcodec/mjpega_dump_header_bsf.c | 2 +- libavcodec/movsub_bsf.c | 2 +- libavcodec/mp3_header_decompress_bsf.c | 2 +- libavcodec/mpeg2_metadata_bsf.c | 2 +- libavcodec/mpeg4_unpack_bframes_bsf.c | 2 +- libavcodec/noise_bsf.c | 2 +- libavcodec/null_bsf.c | 2 +- libavcodec/prores_metadata_bsf.c | 2 +- libavcodec/remove_extradata_bsf.c | 2 +- libavcodec/trace_headers_bsf.c | 2 +- libavcodec/truehd_core_bsf.c | 2 +- libavcodec/vp9_metadata_bsf.c | 2 +- libavcodec/vp9_raw_reorder_bsf.c | 2 +- libavcodec/vp9_superframe_bsf.c | 2 +- libavcodec/vp9_superframe_split_bsf.c | 2 +- 36 files changed, 38 insertions(+), 38 deletions(-) rename libavcodec/{bsf.h => bsf_internal.h} (93%) diff --git a/libavcodec/aac_adtstoasc_bsf.c b/libavcodec/aac_adtstoasc_bsf.c index e378296950..1d0117fecb 100644 --- a/libavcodec/aac_adtstoasc_bsf.c +++ b/libavcodec/aac_adtstoasc_bsf.c @@ -22,7 +22,7 @@ #include "adts_header.h" #include "adts_parser.h" #include "avcodec.h" -#include "bsf.h" +#include "bsf_internal.h" #include "put_bits.h" #include "get_bits.h" #include "mpeg4audio.h" diff --git a/libavcodec/av1_frame_merge_bsf.c b/libavcodec/av1_frame_merge_bsf.c index 49397111fc..c67b86c8d4 100644 --- a/libavcodec/av1_frame_merge_bsf.c +++ b/libavcodec/av1_frame_merge_bsf.c @@ -19,7 +19,7 @@ */ #include "avcodec.h" -#include "bsf.h" +#include "bsf_internal.h" #include "cbs.h" #include "cbs_av1.h" diff --git a/libavcodec/av1_frame_split_bsf.c b/libavcodec/av1_frame_split_bsf.c index a386c6edc1..fc9eac0324 100644 --- a/libavcodec/av1_frame_split_bsf.c +++ b/libavcodec/av1_frame_split_bsf.c @@ -33,7 +33,7 @@ #include "libavutil/avassert.h" #include "avcodec.h" -#include "bsf.h" +#include "bsf_internal.h" #include "cbs.h" #include "cbs_av1.h" diff --git a/libavcodec/av1_metadata_bsf.c b/libavcodec/av1_metadata_bsf.c index dd0c9b6148..d704bc1409 100644 --- a/libavcodec/av1_metadata_bsf.c +++ b/libavcodec/av1_metadata_bsf.c @@ -19,7 +19,7 @@ #include "libavutil/common.h" #include "libavutil/opt.h" -#include "bsf.h" +#include "bsf_internal.h" #include "cbs.h" #include "cbs_av1.h" diff --git a/libavcodec/bitstream_filters.c b/libavcodec/bitstream_filters.c index 6b5ffe4d70..8a1005ac56 100644 --- a/libavcodec/bitstream_filters.c +++ b/libavcodec/bitstream_filters.c @@ -22,7 +22,7 @@ #include "libavutil/log.h" #include "avcodec.h" -#include "bsf.h" +#include "bsf_internal.h" extern const AVBitStreamFilter ff_aac_adtstoasc_bsf; extern const AVBitStreamFilter ff_av1_frame_merge_bsf; diff --git a/libavcodec/bsf.c b/libavcodec/bsf.c index 7b96183e64..a8d5c3082a 100644 --- a/libavcodec/bsf.c +++ b/libavcodec/bsf.c @@ -25,7 +25,7 @@ #include "libavutil/bprint.h" #include "avcodec.h" -#include "bsf.h" +#include "bsf_internal.h" struct AVBSFInternal { AVPacket *buffer_pkt; diff --git a/libavcodec/bsf.h b/libavcodec/bsf_internal.h similarity index 93% rename from libavcodec/bsf.h rename to libavcodec/bsf_internal.h index af035eee44..de4684c4c2 100644 --- a/libavcodec/bsf.h +++ b/libavcodec/bsf_internal.h @@ -16,8 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_BSF_H -#define AVCODEC_BSF_H +#ifndef AVCODEC_BSF_INTERNAL_H +#define AVCODEC_BSF_INTERNAL_H #include "avcodec.h" @@ -41,4 +41,4 @@ int ff_bsf_get_packet_ref(AVBSFContext *ctx, AVPacket *pkt); const AVClass *ff_bsf_child_class_next(const AVClass *prev); -#endif /* AVCODEC_BSF_H */ +#endif /* AVCODEC_BSF_INTERNAL_H */ diff --git a/libavcodec/chomp_bsf.c b/libavcodec/chomp_bsf.c index 3ba45f3e06..d7461afebd 100644 --- a/libavcodec/chomp_bsf.c +++ b/libavcodec/chomp_bsf.c @@ -20,7 +20,7 @@ */ #include "avcodec.h" -#include "bsf.h" +#include "bsf_internal.h" #include "internal.h" static int chomp_filter(AVBSFContext *ctx, AVPacket *pkt) diff --git a/libavcodec/dca_core_bsf.c b/libavcodec/dca_core_bsf.c index 8565796951..b78995dbb7 100644 --- a/libavcodec/dca_core_bsf.c +++ b/libavcodec/dca_core_bsf.c @@ -19,7 +19,7 @@ */ #include "avcodec.h" -#include "bsf.h" +#include "bsf_internal.h" #include "bytestream.h" #include "dca_syncwords.h" #include "libavutil/mem.h" diff --git a/libavcodec/dump_extradata_bsf.c b/libavcodec/dump_extradata_bsf.c index 0b6d404792..9727b9983a 100644 --- a/libavcodec/dump_extradata_bsf.c +++ b/libavcodec/dump_extradata_bsf.c @@ -21,7 +21,7 @@ #include #include "avcodec.h" -#include "bsf.h" +#include "bsf_internal.h" #include "libavutil/log.h" #include "libavutil/mem.h" diff --git a/libavcodec/eac3_core_bsf.c b/libavcodec/eac3_core_bsf.c index 3e4dc2e2a2..c584d69227 100644 --- a/libavcodec/eac3_core_bsf.c +++ b/libavcodec/eac3_core_bsf.c @@ -19,7 +19,7 @@ */ #include "avcodec.h" -#include "bsf.h" +#include "bsf_internal.h" #include "get_bits.h" #include "ac3_parser_internal.h" diff --git a/libavcodec/extract_extradata_bsf.c b/libavcodec/extract_extradata_bsf.c index 46b76dfbef..d7ffa1bff2 100644 --- a/libavcodec/extract_extradata_bsf.c +++ b/libavcodec/extract_extradata_bsf.c @@ -26,7 +26,7 @@ #include "avcodec.h" #include "av1.h" #include "av1_parse.h" -#include "bsf.h" +#include "bsf_internal.h" #include "bytestream.h" #include "h2645_parse.h" #include "h264.h" diff --git a/libavcodec/filter_units_bsf.c b/libavcodec/filter_units_bsf.c index 380f23e5a7..7c3819c7b3 100644 --- a/libavcodec/filter_units_bsf.c +++ b/libavcodec/filter_units_bsf.c @@ -21,7 +21,7 @@ #include "libavutil/common.h" #include "libavutil/opt.h" -#include "bsf.h" +#include "bsf_internal.h" #include "cbs.h" diff --git a/libavcodec/h264_metadata_bsf.c b/libavcodec/h264_metadata_bsf.c index d96a50dbf7..4cce5b1f1a 100644 --- a/libavcodec/h264_metadata_bsf.c +++ b/libavcodec/h264_metadata_bsf.c @@ -21,7 +21,7 @@ #include "libavutil/common.h" #include "libavutil/opt.h" -#include "bsf.h" +#include "bsf_internal.h" #include "cbs.h" #include "cbs_h264.h" #include "h264.h" diff --git a/libavcodec/h264_mp4toannexb_bsf.c b/libavcodec/h264_mp4toannexb_bsf.c index 0150f97a1a..52fc9b90cf 100644 --- a/libavcodec/h264_mp4toannexb_bsf.c +++ b/libavcodec/h264_mp4toannexb_bsf.c @@ -26,7 +26,7 @@ #include "libavutil/mem.h" #include "avcodec.h" -#include "bsf.h" +#include "bsf_internal.h" #include "bytestream.h" #include "h264.h" diff --git a/libavcodec/h264_redundant_pps_bsf.c b/libavcodec/h264_redundant_pps_bsf.c index 8405738c4b..34885d320a 100644 --- a/libavcodec/h264_redundant_pps_bsf.c +++ b/libavcodec/h264_redundant_pps_bsf.c @@ -21,7 +21,7 @@ #include "libavutil/common.h" #include "libavutil/mem.h" -#include "bsf.h" +#include "bsf_internal.h" #include "cbs.h" #include "cbs_h264.h" #include "h264.h" diff --git a/libavcodec/h265_metadata_bsf.c b/libavcodec/h265_metadata_bsf.c index 730f7ac28f..6269ca00ab 100644 --- a/libavcodec/h265_metadata_bsf.c +++ b/libavcodec/h265_metadata_bsf.c @@ -19,7 +19,7 @@ #include "libavutil/common.h" #include "libavutil/opt.h" -#include "bsf.h" +#include "bsf_internal.h" #include "cbs.h" #include "cbs_h265.h" #include "hevc.h" diff --git a/libavcodec/hapqa_extract_bsf.c b/libavcodec/hapqa_extract_bsf.c index 5c22184813..9fdcbe2886 100644 --- a/libavcodec/hapqa_extract_bsf.c +++ b/libavcodec/hapqa_extract_bsf.c @@ -26,7 +26,7 @@ */ #include "avcodec.h" -#include "bsf.h" +#include "bsf_internal.h" #include "bytestream.h" #include "hap.h" diff --git a/libavcodec/hevc_mp4toannexb_bsf.c b/libavcodec/hevc_mp4toannexb_bsf.c index baa93628ed..f3efc33ab8 100644 --- a/libavcodec/hevc_mp4toannexb_bsf.c +++ b/libavcodec/hevc_mp4toannexb_bsf.c @@ -25,7 +25,7 @@ #include "libavutil/mem.h" #include "avcodec.h" -#include "bsf.h" +#include "bsf_internal.h" #include "bytestream.h" #include "hevc.h" diff --git a/libavcodec/imx_dump_header_bsf.c b/libavcodec/imx_dump_header_bsf.c index 9a9de05f05..6f3d7e52b0 100644 --- a/libavcodec/imx_dump_header_bsf.c +++ b/libavcodec/imx_dump_header_bsf.c @@ -26,7 +26,7 @@ */ #include "avcodec.h" -#include "bsf.h" +#include "bsf_internal.h" #include "bytestream.h" diff --git a/libavcodec/mjpeg2jpeg_bsf.c b/libavcodec/mjpeg2jpeg_bsf.c index 6f02bc033c..25f5b31a73 100644 --- a/libavcodec/mjpeg2jpeg_bsf.c +++ b/libavcodec/mjpeg2jpeg_bsf.c @@ -31,7 +31,7 @@ #include "libavutil/intreadwrite.h" #include "avcodec.h" -#include "bsf.h" +#include "bsf_internal.h" #include "jpegtables.h" #include "mjpeg.h" diff --git a/libavcodec/mjpega_dump_header_bsf.c b/libavcodec/mjpega_dump_header_bsf.c index ca5fb3a377..e8a440a69f 100644 --- a/libavcodec/mjpega_dump_header_bsf.c +++ b/libavcodec/mjpega_dump_header_bsf.c @@ -26,7 +26,7 @@ */ #include "avcodec.h" -#include "bsf.h" +#include "bsf_internal.h" #include "bytestream.h" #include "mjpeg.h" diff --git a/libavcodec/movsub_bsf.c b/libavcodec/movsub_bsf.c index cd48aa7bb8..bfc06a70f8 100644 --- a/libavcodec/movsub_bsf.c +++ b/libavcodec/movsub_bsf.c @@ -21,7 +21,7 @@ #include "libavutil/common.h" #include "libavutil/intreadwrite.h" #include "avcodec.h" -#include "bsf.h" +#include "bsf_internal.h" static int text2movsub(AVBSFContext *ctx, AVPacket *out) { diff --git a/libavcodec/mp3_header_decompress_bsf.c b/libavcodec/mp3_header_decompress_bsf.c index ab3d420300..158d96853e 100644 --- a/libavcodec/mp3_header_decompress_bsf.c +++ b/libavcodec/mp3_header_decompress_bsf.c @@ -21,7 +21,7 @@ #include "libavutil/common.h" #include "libavutil/intreadwrite.h" #include "avcodec.h" -#include "bsf.h" +#include "bsf_internal.h" #include "mpegaudiodecheader.h" #include "mpegaudiodata.h" diff --git a/libavcodec/mpeg2_metadata_bsf.c b/libavcodec/mpeg2_metadata_bsf.c index 3f371a028d..8c6dad9625 100644 --- a/libavcodec/mpeg2_metadata_bsf.c +++ b/libavcodec/mpeg2_metadata_bsf.c @@ -20,7 +20,7 @@ #include "libavutil/common.h" #include "libavutil/opt.h" -#include "bsf.h" +#include "bsf_internal.h" #include "cbs.h" #include "cbs_mpeg2.h" #include "mpeg12.h" diff --git a/libavcodec/mpeg4_unpack_bframes_bsf.c b/libavcodec/mpeg4_unpack_bframes_bsf.c index 1500d2135d..6934cce73a 100644 --- a/libavcodec/mpeg4_unpack_bframes_bsf.c +++ b/libavcodec/mpeg4_unpack_bframes_bsf.c @@ -20,7 +20,7 @@ */ #include "avcodec.h" -#include "bsf.h" +#include "bsf_internal.h" #include "internal.h" #include "mpeg4video.h" diff --git a/libavcodec/noise_bsf.c b/libavcodec/noise_bsf.c index 721fd217ec..69bd87f3f3 100644 --- a/libavcodec/noise_bsf.c +++ b/libavcodec/noise_bsf.c @@ -22,7 +22,7 @@ #include #include "avcodec.h" -#include "bsf.h" +#include "bsf_internal.h" #include "libavutil/log.h" #include "libavutil/mem.h" diff --git a/libavcodec/null_bsf.c b/libavcodec/null_bsf.c index 24d26dfb1a..052355b6e6 100644 --- a/libavcodec/null_bsf.c +++ b/libavcodec/null_bsf.c @@ -22,7 +22,7 @@ */ #include "avcodec.h" -#include "bsf.h" +#include "bsf_internal.h" static int null_filter(AVBSFContext *ctx, AVPacket *pkt) { diff --git a/libavcodec/prores_metadata_bsf.c b/libavcodec/prores_metadata_bsf.c index 0510d3520a..239f5c3cfa 100644 --- a/libavcodec/prores_metadata_bsf.c +++ b/libavcodec/prores_metadata_bsf.c @@ -28,7 +28,7 @@ #include "libavutil/common.h" #include "libavutil/intreadwrite.h" #include "libavutil/opt.h" -#include "bsf.h" +#include "bsf_internal.h" typedef struct ProresMetadataContext { const AVClass *class; diff --git a/libavcodec/remove_extradata_bsf.c b/libavcodec/remove_extradata_bsf.c index b762079e05..7ea12d260a 100644 --- a/libavcodec/remove_extradata_bsf.c +++ b/libavcodec/remove_extradata_bsf.c @@ -22,7 +22,7 @@ #include "libavutil/opt.h" #include "avcodec.h" -#include "bsf.h" +#include "bsf_internal.h" enum RemoveFreq { REMOVE_FREQ_KEYFRAME, diff --git a/libavcodec/trace_headers_bsf.c b/libavcodec/trace_headers_bsf.c index 3ec78fe822..ffd4e5465b 100644 --- a/libavcodec/trace_headers_bsf.c +++ b/libavcodec/trace_headers_bsf.c @@ -22,7 +22,7 @@ #include "libavutil/common.h" #include "libavutil/log.h" -#include "bsf.h" +#include "bsf_internal.h" #include "cbs.h" diff --git a/libavcodec/truehd_core_bsf.c b/libavcodec/truehd_core_bsf.c index dbd05b34ca..59e5b0035c 100644 --- a/libavcodec/truehd_core_bsf.c +++ b/libavcodec/truehd_core_bsf.c @@ -19,7 +19,7 @@ */ #include "avcodec.h" -#include "bsf.h" +#include "bsf_internal.h" #include "get_bits.h" #include "mlp_parse.h" #include "mlp.h" diff --git a/libavcodec/vp9_metadata_bsf.c b/libavcodec/vp9_metadata_bsf.c index 52e962b1c0..974a5fc6dd 100644 --- a/libavcodec/vp9_metadata_bsf.c +++ b/libavcodec/vp9_metadata_bsf.c @@ -20,7 +20,7 @@ #include "libavutil/common.h" #include "libavutil/opt.h" -#include "bsf.h" +#include "bsf_internal.h" #include "cbs.h" #include "cbs_vp9.h" diff --git a/libavcodec/vp9_raw_reorder_bsf.c b/libavcodec/vp9_raw_reorder_bsf.c index e55a358457..531cd99003 100644 --- a/libavcodec/vp9_raw_reorder_bsf.c +++ b/libavcodec/vp9_raw_reorder_bsf.c @@ -22,7 +22,7 @@ #include "libavutil/mem.h" #include "libavutil/opt.h" -#include "bsf.h" +#include "bsf_internal.h" #include "get_bits.h" #include "put_bits.h" diff --git a/libavcodec/vp9_superframe_bsf.c b/libavcodec/vp9_superframe_bsf.c index b79911bb2c..2584604817 100644 --- a/libavcodec/vp9_superframe_bsf.c +++ b/libavcodec/vp9_superframe_bsf.c @@ -21,7 +21,7 @@ #include "libavutil/avassert.h" #include "avcodec.h" -#include "bsf.h" +#include "bsf_internal.h" #include "get_bits.h" #define MAX_CACHE 8 diff --git a/libavcodec/vp9_superframe_split_bsf.c b/libavcodec/vp9_superframe_split_bsf.c index 13e85c3ca4..00f40aa96e 100644 --- a/libavcodec/vp9_superframe_split_bsf.c +++ b/libavcodec/vp9_superframe_split_bsf.c @@ -25,7 +25,7 @@ #include #include "avcodec.h" -#include "bsf.h" +#include "bsf_internal.h" #include "bytestream.h" #include "get_bits.h"