avformat: Remove unnecessary inclusions from libavcodec

Also improve the other headers a bit while at it.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>

libavformat/a64.c

@@ -19,9 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/intreadwrite.h"
 #include "libavcodec/codec_id.h"
 #include "libavcodec/codec_par.h"
-#include "libavcodec/bytestream.h"
 #include "avformat.h"
 #include "rawenc.h"
 

libavformat/act.c

@@ -18,11 +18,12 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 #include "avio_internal.h"
 #include "riff.h"
 #include "internal.h"
-#include "libavcodec/get_bits.h"
 
 #define CHUNK_SIZE 512
 #define RIFF_TAG MKTAG('R','I','F','F')

libavformat/apngenc.c

@@ -22,14 +22,12 @@
  */
 
 #include "avformat.h"
-#include "internal.h"
 #include "libavutil/avassert.h"
 #include "libavutil/crc.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/log.h"
 #include "libavutil/opt.h"
 #include "libavcodec/png.h"
-#include "libavcodec/apng.h"
 
 typedef struct APNGMuxContext {
     AVClass *class;

libavformat/av1.c

@@ -23,7 +23,7 @@
 #include "libavutil/mem.h"
 #include "libavcodec/av1.h"
 #include "libavcodec/av1_parse.h"
-#include "libavcodec/profiles.h"
+#include "libavcodec/avcodec.h"
 #include "libavcodec/put_bits.h"
 #include "av1.h"
 #include "avio.h"

libavformat/flacenc.h

@@ -22,9 +22,8 @@
 #ifndef AVFORMAT_FLACENC_H
 #define AVFORMAT_FLACENC_H
 
-#include "libavcodec/flac.h"
+#include <stdint.h>
-#include "libavcodec/bytestream.h"
+#include "avio.h"
-#include "avformat.h"
 
 int ff_flac_write_header(AVIOContext *pb, const uint8_t *extradata,
                          int extradata_size, int last_block);

libavformat/flvdec.c

@@ -24,18 +24,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
 #include "libavutil/channel_layout.h"
 #include "libavutil/dict.h"
 #include "libavutil/opt.h"
 #include "libavutil/internal.h"
 #include "libavutil/intfloat.h"
+#include "libavutil/intreadwrite.h"
 #include "libavutil/mathematics.h"
-#include "libavutil/time_internal.h"
-#include "libavcodec/bytestream.h"
 #include "avformat.h"
 #include "internal.h"
-#include "avio_internal.h"
 #include "flv.h"
 
 #define VALIDATE_INDEX_TS_THRESH 2500

libavformat/frmdec.c

@@ -24,7 +24,6 @@
  * Megalux Frame demuxer
  */
 
-#include "libavcodec/raw.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/intreadwrite.h"
 #include "avformat.h"

libavformat/gxf.c

@@ -26,7 +26,6 @@
 #include "avformat.h"
 #include "internal.h"
 #include "gxf.h"
-#include "libavcodec/mpeg12data.h"
 
 struct gxf_stream_info {
     int64_t first_field;

libavformat/h261dec.c

@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavcodec/get_bits.h"
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 #include "rawdec.h"
 

libavformat/hls.c

@@ -30,6 +30,7 @@
 #include "config_components.h"
 
 #include "libavformat/http.h"
+#include "libavutil/aes.h"
 #include "libavutil/avstring.h"
 #include "libavutil/avassert.h"
 #include "libavutil/intreadwrite.h"

libavformat/hls_sample_encryption.c

@@ -26,6 +26,7 @@
  * https://developer.apple.com/library/ios/documentation/AudioVideo/Conceptual/HLS_Sample_Encryption
  */
 
+#include "libavutil/aes.h"
 #include "libavutil/channel_layout.h"
 
 #include "hls_sample_encryption.h"

libavformat/hls_sample_encryption.h

@@ -29,12 +29,13 @@
 #ifndef AVFORMAT_HLS_SAMPLE_ENCRYPTION_H
 #define AVFORMAT_HLS_SAMPLE_ENCRYPTION_H
 
+#include <stddef.h>
 #include <stdint.h>
 
+#include "libavcodec/codec_id.h"
+#include "libavcodec/packet.h"
 #include "avformat.h"
-#include "libavcodec/avcodec.h"
 
-#include "libavutil/aes.h"
 
 #define HLS_MAX_ID3_TAGS_DATA_LEN       138
 #define HLS_MAX_AUDIO_SETUP_DATA_LEN    10

libavformat/icodec.c

@@ -26,7 +26,6 @@
 
 #include "libavutil/intreadwrite.h"
 #include "libavcodec/bytestream.h"
-#include "libavcodec/bmp.h"
 #include "libavcodec/png.h"
 #include "avformat.h"
 #include "internal.h"

libavformat/oggparseskeleton.c

@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavcodec/bytestream.h"
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 #include "internal.h"
 #include "oggdec.h"

libavformat/oggparsespeex.c

@@ -22,13 +22,8 @@
       DEALINGS IN THE SOFTWARE.
 **/
 
-#include <stdlib.h>
-
-#include "libavutil/bswap.h"
-#include "libavutil/avstring.h"
 #include "libavutil/channel_layout.h"
-
+#include "libavutil/intreadwrite.h"
-#include "libavcodec/bytestream.h"
 
 #include "avformat.h"
 #include "internal.h"

libavformat/rsd.c

@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavcodec/bytestream.h"
 #include "libavutil/intreadwrite.h"
 #include "avformat.h"
 #include "avio.h"

libavformat/rtpdec_dv.c

@@ -21,10 +21,8 @@
 
 #include "libavutil/avstring.h"
 
-#include "libavcodec/bytestream.h"
-
 #include "avio_internal.h"
-#include "rtpdec_formats.h"
+#include "rtpdec.h"
 
 struct PayloadContext {
     AVIOContext *buf;

libavformat/rtpdec_hevc.c

@@ -21,8 +21,6 @@
 
 #include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
-#include "libavutil/base64.h"
-#include "libavcodec/get_bits.h"
 
 #include "avformat.h"
 #include "internal.h"

libavformat/rtpdec_vp8.c

@@ -27,10 +27,10 @@
  * @see http://tools.ietf.org/html/draft-ietf-payload-vp8-05
  */
 
-#include "libavcodec/bytestream.h"
+#include "libavutil/intreadwrite.h"
 
 #include "avio_internal.h"
-#include "rtpdec_formats.h"
+#include "rtpdec.h"
 
 struct PayloadContext {
     AVIOContext *data;