diff options
author | James Almer <jamrial@gmail.com> | 2020-06-02 18:38:33 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2020-06-02 19:02:12 -0300 |
commit | 6e1903938befc0bce2f64e01770af2f65d625cfc (patch) | |
tree | 051289a7c1661ea2dd4e49f487d1a945f5b10a34 | |
parent | cca8f53a8e14a62b223c8030c7d083c37505fc95 (diff) | |
download | ffmpeg-6e1903938befc0bce2f64e01770af2f65d625cfc.tar.gz |
avcodec/internal: move packet related functions to their own header
Signed-off-by: James Almer <jamrial@gmail.com>
-rw-r--r-- | libavcodec/avpacket.c | 1 | ||||
-rw-r--r-- | libavcodec/dnxhdenc.c | 1 | ||||
-rw-r--r-- | libavcodec/internal.h | 4 | ||||
-rw-r--r-- | libavcodec/libaomenc.c | 1 | ||||
-rw-r--r-- | libavcodec/libvpxenc.c | 1 | ||||
-rw-r--r-- | libavcodec/libx264.c | 1 | ||||
-rw-r--r-- | libavcodec/libx265.c | 1 | ||||
-rw-r--r-- | libavcodec/libxavs.c | 1 | ||||
-rw-r--r-- | libavcodec/libxvid.c | 1 | ||||
-rw-r--r-- | libavcodec/mpegvideo_enc.c | 1 | ||||
-rw-r--r-- | libavcodec/nvenc.c | 1 | ||||
-rw-r--r-- | libavcodec/packet_internal.h | 30 | ||||
-rw-r--r-- | libavcodec/qsvenc.c | 1 | ||||
-rw-r--r-- | libavcodec/snowenc.c | 1 | ||||
-rw-r--r-- | libavcodec/svq1enc.c | 1 |
15 files changed, 43 insertions, 4 deletions
diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index 033f2d8f26..dce26cb31a 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -30,6 +30,7 @@ #include "bytestream.h" #include "internal.h" #include "packet.h" +#include "packet_internal.h" void av_init_packet(AVPacket *pkt) { diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index fad8400c21..5d5f1ffc0a 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -33,6 +33,7 @@ #include "internal.h" #include "mpegvideo.h" #include "pixblockdsp.h" +#include "packet_internal.h" #include "profiles.h" #include "dnxhdenc.h" diff --git a/libavcodec/internal.h b/libavcodec/internal.h index d09c3167ed..0a72a0e372 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -358,10 +358,6 @@ int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame); */ AVCPBProperties *ff_add_cpb_side_data(AVCodecContext *avctx); -int ff_side_data_set_encoder_stats(AVPacket *pkt, int quality, int64_t *error, int error_count, int pict_type); - -int ff_side_data_set_prft(AVPacket *pkt, int64_t timestamp); - /** * Check AVFrame for A53 side data and allocate and fill SEI message with A53 info * diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index fc1ea96659..9e4bddef85 100644 --- a/libavcodec/libaomenc.c +++ b/libavcodec/libaomenc.c @@ -37,6 +37,7 @@ #include "av1.h" #include "avcodec.h" #include "internal.h" +#include "packet_internal.h" #include "profiles.h" /* diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index 05bcc303d1..8e0ea42375 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -32,6 +32,7 @@ #include "internal.h" #include "libavutil/avassert.h" #include "libvpx.h" +#include "packet_internal.h" #include "profiles.h" #include "libavutil/avstring.h" #include "libavutil/base64.h" diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 7579adc346..d4b1fd0d53 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -29,6 +29,7 @@ #include "libavutil/intreadwrite.h" #include "avcodec.h" #include "internal.h" +#include "packet_internal.h" #if defined(_MSC_VER) #define X264_API_IMPORTS 1 diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index 821175c1b6..f560d7f62f 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -33,6 +33,7 @@ #include "libavutil/pixdesc.h" #include "avcodec.h" #include "internal.h" +#include "packet_internal.h" typedef struct libx265Context { const AVClass *class; diff --git a/libavcodec/libxavs.c b/libavcodec/libxavs.c index 801a05dbb5..752ff66dfa 100644 --- a/libavcodec/libxavs.c +++ b/libavcodec/libxavs.c @@ -28,6 +28,7 @@ #include <xavs.h> #include "avcodec.h" #include "internal.h" +#include "packet_internal.h" #include "libavutil/internal.h" #include "libavutil/mem.h" #include "libavutil/opt.h" diff --git a/libavcodec/libxvid.c b/libavcodec/libxvid.c index cdaae2094e..857077dc3b 100644 --- a/libavcodec/libxvid.c +++ b/libavcodec/libxvid.c @@ -42,6 +42,7 @@ #include "internal.h" #include "libxvid.h" #include "mpegutils.h" +#include "packet_internal.h" #if HAVE_UNISTD_H #include <unistd.h> diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 5a499fba51..d1e2bd9975 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -63,6 +63,7 @@ #include "bytestream.h" #include "wmv2.h" #include "rv10.h" +#include "packet_internal.h" #include "libxvid.h" #include <limits.h> #include "sp5x.h" diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index a9f9600fde..880454c960 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -31,6 +31,7 @@ #include "libavutil/mem.h" #include "libavutil/pixdesc.h" #include "internal.h" +#include "packet_internal.h" #define CHECK_CU(x) FF_CUDA_CHECK_DL(avctx, dl_fn->cuda_dl, x) diff --git a/libavcodec/packet_internal.h b/libavcodec/packet_internal.h new file mode 100644 index 0000000000..cdb9a27f2f --- /dev/null +++ b/libavcodec/packet_internal.h @@ -0,0 +1,30 @@ +/* + * 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_PACKET_INTERNAL_H +#define AVCODEC_PACKET_INTERNAL_H + +#include <stdint.h> + +#include "packet.h" + +int ff_side_data_set_encoder_stats(AVPacket *pkt, int quality, int64_t *error, int error_count, int pict_type); + +int ff_side_data_set_prft(AVPacket *pkt, int64_t timestamp); + +#endif // AVCODEC_PACKET_INTERNAL_H diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index edf37708cb..ed4539f697 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -36,6 +36,7 @@ #include "avcodec.h" #include "internal.h" +#include "packet_internal.h" #include "qsv.h" #include "qsv_internal.h" #include "qsvenc.h" diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index 3f2a75a670..fb8983cd2f 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -25,6 +25,7 @@ #include "libavutil/pixdesc.h" #include "avcodec.h" #include "internal.h" +#include "packet_internal.h" #include "snow_dwt.h" #include "snow.h" diff --git a/libavcodec/svq1enc.c b/libavcodec/svq1enc.c index 651013588f..cb215c250c 100644 --- a/libavcodec/svq1enc.c +++ b/libavcodec/svq1enc.c @@ -33,6 +33,7 @@ #include "h263.h" #include "internal.h" #include "mpegutils.h" +#include "packet_internal.h" #include "svq1.h" #include "svq1enc.h" #include "svq1enc_cb.h" |