avcodec/internal: move packet related functions to their own header

Signed-off-by: James Almer <jamrial@gmail.com>

diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c
index 033f2d8f26ffa7ae84b331753486bb6d0e621e86..dce26cb31a428795bf2029bc97ade55623006b9d 100644 (file)
--- 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 fad8400c215349d4aa7570b66e05a6a3cae59be8..5d5f1ffc0aae9b037fe95ec3f256ecbadcc23116 100644 (file)
--- 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 d09c3167ed3cc5cbebeb50bef21b652751535a8b..0a72a0e3723584989430daaabdb0b6b5c85cf8ab 100644 (file)
--- 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 fc1ea96659a96333061e936c87b9b00cc87b39fc..9e4bddef854f2b9d327aa545e8dbdc30b1453a2b 100644 (file)
--- 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 05bcc303d13870785bd539eb3121c9bb0d65f8e0..8e0ea42375a0f7dc885991a6a8a93051920404e8 100644 (file)
--- 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 7579adc346362f2bf67506a5753dccbb07d79b6b..d4b1fd0d53ea3421730ba091a50252eb20a1c206 100644 (file)
--- 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 821175c1b65dbd554ee4309f07728b4bebd8fd54..f560d7f62f85d8714abb4e5c0c32d307876da90c 100644 (file)
--- 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 801a05dbb581a012860b32c91dd14e129b753f4b..752ff66dfa37839bbdd4f15416f49ed9093ef56e 100644 (file)
--- 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 cdaae2094e57fa02946b2c11eb9235831797a6f3..857077dc3b0e0c4a0ed89910764fa78485acb337 100644 (file)
--- 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 5a499fba5104fe9a71197a3d325b90999b6ea967..d1e2bd997545616ce0ac2b76aa46f4e0cb926203 100644 (file)
--- 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 a9f9600fde12d1244be6567cda56a1be4f6a33d9..880454c960868020dc609ac5d5bea8d43da2a333 100644 (file)
--- 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 (file)
index 0000000..cdb9a27
--- /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 edf37708cb7c6f19b1b007f0ffc6404f81781d98..ed4539f697a365c9c2e650d39cddfc20608d5616 100644 (file)
--- 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 3f2a75a6707f91dc0686a7461417cfa9ecbad37d..fb8983cd2fa5f6c44e862ba91667a7f27c935e2a 100644 (file)
--- 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 651013588f0837fdde7bb7c81350236e6fadb70a..cb215c250c40d23ca4a3fd7fec935dff64fb18cf 100644 (file)
--- 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"