diff options
author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-02-04 15:43:14 +0100 |
---|---|---|
committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-02-08 06:22:14 +0100 |
commit | 70a90fb73e43d8c2d7f09ce6df3a861e65ac6b62 (patch) | |
tree | 7a3b78bc692e32ffa89f567ef50e4f0f1182b7e6 /libavformat | |
parent | 27f22f33834c521a153842fcc0f614360901f2b7 (diff) | |
download | ffmpeg-70a90fb73e43d8c2d7f09ce6df3a861e65ac6b62.tar.gz |
avcodec/internal.h: Move avpriv_find_start_code() to startcode.h
This is by definition the appropriate place for it.
Remove all the now unnecessary libavcodec/internal.h inclusions;
also remove other unnecessary headers from the affected files.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/avidec.c | 2 | ||||
-rw-r--r-- | libavformat/avs2dec.c | 2 | ||||
-rw-r--r-- | libavformat/avs3dec.c | 2 | ||||
-rw-r--r-- | libavformat/cavsvideodec.c | 2 | ||||
-rw-r--r-- | libavformat/mpegtsenc.c | 2 | ||||
-rw-r--r-- | libavformat/mpegvideodec.c | 2 | ||||
-rw-r--r-- | libavformat/mxfenc.c | 6 | ||||
-rw-r--r-- | libavformat/rtpenc_mpv.c | 2 |
8 files changed, 9 insertions, 11 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 86f857b1e3..0f0e6846da 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -36,7 +36,7 @@ #include "riff.h" #include "libavcodec/bytestream.h" #include "libavcodec/exif.h" -#include "libavcodec/internal.h" +#include "libavcodec/startcode.h" typedef struct AVIStream { int64_t frame_offset; /* current frame (video) or byte (audio) counter diff --git a/libavformat/avs2dec.c b/libavformat/avs2dec.c index 51908d2b63..0d5b23b65e 100644 --- a/libavformat/avs2dec.c +++ b/libavformat/avs2dec.c @@ -22,7 +22,7 @@ #include "avformat.h" #include "rawdec.h" -#include "libavcodec/internal.h" +#include "libavcodec/startcode.h" #include "libavutil/intreadwrite.h" #define AVS2_ISSQH(x) ((x) == 0xB0) diff --git a/libavformat/avs3dec.c b/libavformat/avs3dec.c index 253caa7c1d..2395df171b 100644 --- a/libavformat/avs3dec.c +++ b/libavformat/avs3dec.c @@ -22,7 +22,7 @@ */ #include "libavcodec/avs3.h" -#include "libavcodec/internal.h" +#include "libavcodec/startcode.h" #include "avformat.h" #include "rawdec.h" diff --git a/libavformat/cavsvideodec.c b/libavformat/cavsvideodec.c index 8900b97597..1fa3aa5e92 100644 --- a/libavformat/cavsvideodec.c +++ b/libavformat/cavsvideodec.c @@ -19,9 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavcodec/startcode.h" #include "avformat.h" #include "rawdec.h" -#include "libavcodec/internal.h" #define CAVS_SEQ_START_CODE 0x000001b0 #define CAVS_PIC_I_START_CODE 0x000001b3 diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 92b4cc8087..971b3f55d8 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -28,7 +28,7 @@ #include "libavutil/opt.h" #include "libavcodec/ac3_parser_internal.h" -#include "libavcodec/internal.h" +#include "libavcodec/startcode.h" #include "avformat.h" #include "avio_internal.h" diff --git a/libavformat/mpegvideodec.c b/libavformat/mpegvideodec.c index 2d6f81aaa1..33c5d79794 100644 --- a/libavformat/mpegvideodec.c +++ b/libavformat/mpegvideodec.c @@ -24,7 +24,7 @@ #include "rawdec.h" #include "libavutil/intreadwrite.h" -#include "libavcodec/internal.h" +#include "libavcodec/startcode.h" #define SEQ_START_CODE 0x000001b3 #define GOP_START_CODE 0x000001b8 diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index 5e068c8220..1e87dc6111 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -48,12 +48,10 @@ #include "libavutil/mastering_display_metadata.h" #include "libavutil/pixdesc.h" #include "libavutil/time_internal.h" -#include "libavcodec/bytestream.h" -#include "libavcodec/dv_profile.h" -#include "libavcodec/h264_ps.h" #include "libavcodec/golomb.h" -#include "libavcodec/internal.h" +#include "libavcodec/h264.h" #include "libavcodec/packet_internal.h" +#include "libavcodec/startcode.h" #include "avformat.h" #include "avio_internal.h" #include "internal.h" diff --git a/libavformat/rtpenc_mpv.c b/libavformat/rtpenc_mpv.c index 4b45f51772..c18c75082f 100644 --- a/libavformat/rtpenc_mpv.c +++ b/libavformat/rtpenc_mpv.c @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavcodec/internal.h" +#include "libavcodec/startcode.h" #include "avformat.h" #include "rtpenc.h" |