From cdaa1f84fb6f6e8234e95e9322c647c6a432e0bf Mon Sep 17 00:00:00 2001
From: Justin Ruggles <justin.ruggles@gmail.com>
Date: Mon, 26 Nov 2012 23:23:01 -0500
Subject: lavf: move "MP3 " fourcc from riff to nut

Original commit, 7b24f9b, says it was added because it is used in libnut.
---
 libavformat/nut.c  | 1 +
 libavformat/riff.c | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

(limited to 'libavformat')

diff --git a/libavformat/nut.c b/libavformat/nut.c
index 65fadbfa47..196e04e54f 100644
--- a/libavformat/nut.c
+++ b/libavformat/nut.c
@@ -145,6 +145,7 @@ const AVCodecTag ff_nut_audio_tags[] = {
     { AV_CODEC_ID_PCM_U32LE,        MKTAG('P', 'U', 'D', 32 ) },
     { AV_CODEC_ID_PCM_U8,           MKTAG('P', 'U', 'D',  8 ) },
     { AV_CODEC_ID_PCM_S16LE_PLANAR, MKTAG('P', 'S', 'P', 16 ) },
+    { AV_CODEC_ID_MP3,              MKTAG('M', 'P', '3', ' ') },
     { AV_CODEC_ID_NONE,             0                         }
 };
 
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 190504cc79..fde11317fe 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -348,7 +348,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 },
 };
 
-- 
cgit v1.2.3


From bfe5454cd238b16e7977085f880205229103eccb Mon Sep 17 00:00:00 2001
From: Justin Ruggles <justin.ruggles@gmail.com>
Date: Tue, 27 Nov 2012 11:52:28 -0500
Subject: lavf: move ff_codec_get_tag() and ff_codec_get_id() definitions to
 internal.h

---
 libavformat/aiff.h      | 2 +-
 libavformat/au.c        | 1 -
 libavformat/cafdec.c    | 1 -
 libavformat/gxfenc.c    | 1 -
 libavformat/internal.h  | 3 +++
 libavformat/isom.c      | 1 -
 libavformat/lxfdec.c    | 1 -
 libavformat/nsvdec.c    | 1 -
 libavformat/nut.h       | 2 +-
 libavformat/nutdec.c    | 1 +
 libavformat/nutenc.c    | 1 +
 libavformat/omadec.c    | 1 -
 libavformat/riff.h      | 2 --
 libavformat/rmdec.c     | 1 -
 libavformat/rsodec.c    | 1 -
 libavformat/smjpegenc.c | 1 -
 libavformat/swf.h       | 2 +-
 libavformat/voc.h       | 2 +-
 18 files changed, 9 insertions(+), 16 deletions(-)

(limited to 'libavformat')

diff --git a/libavformat/aiff.h b/libavformat/aiff.h
index a30e33e09b..f88f957e71 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 e09d7ac5cd..f4ca09493e 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 b3cbb39a4c..6950eb2288 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 c5fb0aebaa..128122f9d9 100644
--- 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
index 01e3df3133..aafbed94a0 100644
--- 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
index ad871292cf..1294a1d9a7 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 e0eb935f8b..a10dcca08f 100644
--- 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
index 654a968b39..d7c3c81f36 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"
 
 //#define DEBUG_DUMP_INDEX // XXX dumbdriving-271.nsv breaks with it commented!!
diff --git a/libavformat/nut.h b/libavformat/nut.h
index 5f624eb22d..89b0248fa4 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 9ce05191a9..b705987795 100644
--- 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
index e9e313bfe1..df70f94122 100644
--- 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
index 9b229994ba..2e565c1716 100644
--- 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
index 167d8fc49b..761f92ed8f 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);
 
 int ff_read_riff_info(AVFormatContext *s, int64_t size);
diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c
index aff21fbbd5..3cf2c97fe4 100644
--- 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
index c3016ca332..3a441a3a3d 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 59ede7a266..5c64e844ad 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 97e7b2d4f0..79c3c1d033 100644
--- 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
index 1668618fda..d2c0cb46cb 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;
-- 
cgit v1.2.3