aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-11-29 13:45:57 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-11-29 13:45:57 +0100
commit076300bf8b43d5d56a91cd2ad845d596969c87cf (patch)
tree487b8a917a0125e4cc086ccbcf575727ebb0b289 /libavformat
parent7dc0ed80e877a16a11ba45d747723d88e8a92cd8 (diff)
parentbfe5454cd238b16e7977085f880205229103eccb (diff)
downloadffmpeg-076300bf8b43d5d56a91cd2ad845d596969c87cf.tar.gz
Merge commit 'bfe5454cd238b16e7977085f880205229103eccb'
* commit 'bfe5454cd238b16e7977085f880205229103eccb': lavf: move ff_codec_get_tag() and ff_codec_get_id() definitions to internal.h lavf: move "MP3 " fourcc from riff to nut fate: vpx: Add dependencies fate: Fix wavpack-matroskamode test dependencies x86: dsputilenc: port to cpuflags Conflicts: libavformat/internal.h libavformat/nut.c tests/fate/vpx.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/aiff.h2
-rw-r--r--libavformat/au.c1
-rw-r--r--libavformat/cafdec.c1
-rw-r--r--libavformat/gxfenc.c1
-rw-r--r--libavformat/internal.h4
-rw-r--r--libavformat/isom.c1
-rw-r--r--libavformat/lxfdec.c1
-rw-r--r--libavformat/nsvdec.c1
-rw-r--r--libavformat/nut.c1
-rw-r--r--libavformat/nut.h2
-rw-r--r--libavformat/nutdec.c1
-rw-r--r--libavformat/nutenc.c1
-rw-r--r--libavformat/omadec.c1
-rw-r--r--libavformat/riff.c1
-rw-r--r--libavformat/riff.h2
-rw-r--r--libavformat/rmdec.c1
-rw-r--r--libavformat/rsodec.c1
-rw-r--r--libavformat/smjpegenc.c1
-rw-r--r--libavformat/swf.h2
-rw-r--r--libavformat/voc.h2
20 files changed, 11 insertions, 17 deletions
diff --git a/libavformat/aiff.h b/libavformat/aiff.h
index bd428029c0..5521568202 100644
--- 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
index d4d4ff3432..6797c3c479 100644
--- 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
index 7fd9c6b8d1..718942bd8a 100644
--- 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
index 9bec3d52cf..28acb74db9 100644
--- a/libavformat/gxfenc.c
+++ b/libavformat/gxfenc.c
@@ -27,7 +27,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
index 4a9ed53def..4f740c99d1 100644
--- a/libavformat/internal.h
+++ b/libavformat/internal.h
@@ -355,6 +355,10 @@ 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);
+
/**
* Chooses a timebase for muxing the specified stream.
*
diff --git a/libavformat/isom.c b/libavformat/isom.c
index 32710569a3..2c412dda29 100644
--- 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
index 3137cda851..90c49749a6 100644
--- a/libavformat/lxfdec.c
+++ b/libavformat/lxfdec.c
@@ -23,7 +23,6 @@
#include "libavcodec/bytestream.h"
#include "avformat.h"
#include "internal.h"
-#include "riff.h"
#define LXF_MAX_PACKET_HEADER_SIZE 256
#define LXF_HEADER_DATA_SIZE 120
diff --git a/libavformat/nsvdec.c b/libavformat/nsvdec.c
index 3015d84491..b6984a68a2 100644
--- 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"
#include "libavutil/intreadwrite.h"
diff --git a/libavformat/nut.c b/libavformat/nut.c
index fc300fe378..62a650dbed 100644
--- a/libavformat/nut.c
+++ b/libavformat/nut.c
@@ -149,6 +149,7 @@ const AVCodecTag ff_nut_video_tags[] = {
static const AVCodecTag nut_audio_extra_tags[] = {
{ AV_CODEC_ID_PCM_ALAW, MKTAG('A', 'L', 'A', 'W') },
{ AV_CODEC_ID_PCM_MULAW, MKTAG('U', 'L', 'A', 'W') },
+ { AV_CODEC_ID_MP3, MKTAG('M', 'P', '3', ' ') },
{ AV_CODEC_ID_NONE, 0 }
};
diff --git a/libavformat/nut.h b/libavformat/nut.h
index deb3c901e3..ab31c27429 100644
--- 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
index 9954583fc2..ac3ef7d909 100644
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -28,6 +28,7 @@
#include "libavutil/tree.h"
#include "avio_internal.h"
#include "nut.h"
+#include "riff.h"
#define NUT_MAX_STREAMS 256 /* arbitrary sanity check value */
diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c
index 72e28b8d26..46711528a0 100644
--- a/libavformat/nutenc.c
+++ b/libavformat/nutenc.c
@@ -28,6 +28,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
index e8b74ed7f0..8d29675c1c 100644
--- a/libavformat/omadec.c
+++ b/libavformat/omadec.c
@@ -46,7 +46,6 @@
#include "libavutil/des.h"
#include "oma.h"
#include "pcm.h"
-#include "riff.h"
#include "id3v2.h"
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 5ad0eb01c8..cddbec477c 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -389,7 +389,6 @@ const AVCodecTag ff_codec_wav_tags[] = {
// for NuppelVideo (nuv.c)
{ AV_CODEC_ID_PCM_S16LE, MKTAG('R', 'A', 'W', 'A') },
{ AV_CODEC_ID_MP3, MKTAG('L', 'A', 'M', 'E') },
- { AV_CODEC_ID_MP3, MKTAG('M', 'P', '3', ' ') },
{ AV_CODEC_ID_NONE, 0 },
};
diff --git a/libavformat/riff.h b/libavformat/riff.h
index 6f2eeac176..8579a953c8 100644
--- 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);
typedef uint8_t ff_asf_guid[16];
diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c
index bcfff41422..2bfa5ceeda 100644
--- a/libavformat/rmdec.c
+++ b/libavformat/rmdec.c
@@ -26,7 +26,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
index 1b3a536245..19c21e0291 100644
--- 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
index 13095bc23d..0a2768785a 100644
--- 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
index 6ecd0da2fe..b9722c1c9a 100644
--- a/libavformat/swf.h
+++ b/libavformat/swf.h
@@ -32,7 +32,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
index 90178b3175..08db970ae6 100644
--- 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;
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-30 18:43:07 +0000