lavf: move ff_codec_get_tag() and ff_codec_get_id() definitions to in…

…ternal.h
SaschaVasarrhelyi · Nov 28, 2012 · bfe5454 · bfe5454
1 parent cdaa1f8
commit bfe5454
Show file tree

Hide file tree

Showing 18 changed files with 9 additions and 16 deletions.
diff --git a/libavformat/aiff.h b/libavformat/aiff.h
@@ -28,7 +28,7 @@
 #define AVFORMAT_AIFF_H
 
 #include "avformat.h"
-#include "riff.h"
+#include "internal.h"
 
 static const AVCodecTag ff_codec_aiff_tags[] = {
     { AV_CODEC_ID_PCM_S16BE,    MKTAG('N','O','N','E') },

diff --git a/libavformat/au.c b/libavformat/au.c
@@ -31,7 +31,6 @@
 #include "internal.h"
 #include "avio_internal.h"
 #include "pcm.h"
-#include "riff.h"
 
 /* if we don't know the size in advance */
 #define AU_UNKNOWN_SIZE ((uint32_t)(~0))

diff --git a/libavformat/cafdec.c b/libavformat/cafdec.c
@@ -27,7 +27,6 @@
 
 #include "avformat.h"
 #include "internal.h"
-#include "riff.h"
 #include "isom.h"
 #include "mov_chan.h"
 #include "libavutil/intreadwrite.h"

diff --git a/libavformat/gxfenc.c b/libavformat/gxfenc.c
@@ -24,7 +24,6 @@
 #include "avformat.h"
 #include "internal.h"
 #include "gxf.h"
-#include "riff.h"
 #include "audiointerleave.h"
 
 #define GXF_AUDIO_PACKET_SIZE 65536

diff --git a/libavformat/internal.h b/libavformat/internal.h
@@ -354,5 +354,8 @@ void ff_compute_frame_duration(int *pnum, int *pden, AVStream *st,
 
 int ff_get_audio_frame_size(AVCodecContext *enc, int size, int mux);
 
+unsigned int ff_codec_get_tag(const AVCodecTag *tags, enum AVCodecID id);
+
+enum AVCodecID ff_codec_get_id(const AVCodecTag *tags, unsigned int tag);
 
 #endif /* AVFORMAT_INTERNAL_H */
diff --git a/libavformat/isom.c b/libavformat/isom.c
@@ -26,7 +26,6 @@
 #include "avformat.h"
 #include "internal.h"
 #include "isom.h"
-#include "riff.h"
 #include "libavcodec/mpeg4audio.h"
 #include "libavcodec/mpegaudiodata.h"
 

diff --git a/libavformat/lxfdec.c b/libavformat/lxfdec.c
@@ -22,7 +22,6 @@
 #include "libavutil/intreadwrite.h"
 #include "avformat.h"
 #include "internal.h"
-#include "riff.h"
 
 #define LXF_PACKET_HEADER_SIZE  60
 #define LXF_HEADER_DATA_SIZE    120

diff --git a/libavformat/nsvdec.c b/libavformat/nsvdec.c
@@ -23,7 +23,6 @@
 #include "libavutil/mathematics.h"
 #include "avformat.h"
 #include "internal.h"
-#include "riff.h"
 #include "libavutil/dict.h"
 
 //#define DEBUG_DUMP_INDEX // XXX dumbdriving-271.nsv breaks with it commented!!

diff --git a/libavformat/nut.h b/libavformat/nut.h
@@ -26,7 +26,7 @@
 //#include "libavutil/adler32.h"
 //#include "libavcodec/mpegaudio.h"
 #include "avformat.h"
-#include "riff.h"
+#include "internal.h"
 #include "metadata.h"
 
 #define      MAIN_STARTCODE (0x7A561F5F04ADULL + (((uint64_t)('N'<<8) + 'M')<<48))

diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
@@ -27,6 +27,7 @@
 #include "libavutil/tree.h"
 #include "avio_internal.h"
 #include "nut.h"
+#include "riff.h"
 
 #undef NDEBUG
 #include <assert.h>

diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c
@@ -27,6 +27,7 @@
 #include "nut.h"
 #include "internal.h"
 #include "avio_internal.h"
+#include "riff.h"
 
 static int find_expected_header(AVCodecContext *c, int size, int key_frame,
                                 uint8_t out[64])

diff --git a/libavformat/omadec.c b/libavformat/omadec.c
@@ -47,7 +47,6 @@
 #include "libavutil/des.h"
 #include "oma.h"
 #include "pcm.h"
-#include "riff.h"
 #include "id3v2.h"
 
 

diff --git a/libavformat/riff.h b/libavformat/riff.h
@@ -54,8 +54,6 @@ int ff_get_wav_header(AVIOContext *pb, AVCodecContext *codec, int size);
 extern const AVCodecTag ff_codec_bmp_tags[];
 extern const AVCodecTag ff_codec_wav_tags[];
 
-unsigned int ff_codec_get_tag(const AVCodecTag *tags, enum AVCodecID id);
-enum AVCodecID ff_codec_get_id(const AVCodecTag *tags, unsigned int tag);
 void ff_parse_specific_params(AVCodecContext *stream, int *au_rate, int *au_ssize, int *au_scale);
 
 int ff_read_riff_info(AVFormatContext *s, int64_t size);

diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c
@@ -25,7 +25,6 @@
 #include "libavutil/dict.h"
 #include "avformat.h"
 #include "internal.h"
-#include "riff.h"
 #include "rmsipr.h"
 #include "rm.h"
 

diff --git a/libavformat/rsodec.c b/libavformat/rsodec.c
@@ -25,7 +25,6 @@
 #include "avformat.h"
 #include "internal.h"
 #include "pcm.h"
-#include "riff.h"
 #include "rso.h"
 
 static int rso_read_header(AVFormatContext *s)

diff --git a/libavformat/smjpegenc.c b/libavformat/smjpegenc.c
@@ -26,7 +26,6 @@
 
 #include "avformat.h"
 #include "internal.h"
-#include "riff.h"
 #include "smjpeg.h"
 
 typedef struct SMJPEGMuxContext {

diff --git a/libavformat/swf.h b/libavformat/swf.h
@@ -26,7 +26,7 @@
 #include "libavutil/fifo.h"
 #include "avformat.h"
 #include "avio.h"
-#include "riff.h"    /* for CodecTag */
+#include "internal.h"
 
 /* should have a generic way to indicate probable size */
 #define DUMMY_FILE_SIZE   (100 * 1024 * 1024)

diff --git a/libavformat/voc.h b/libavformat/voc.h
@@ -23,7 +23,7 @@
 #define AVFORMAT_VOC_H
 
 #include "avformat.h"
-#include "riff.h"    /* for CodecTag */
+#include "internal.h"
 
 typedef struct voc_dec_context {
     int64_t remaining_size;