aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2012-08-08 15:51:59 +0200
committerDiego Biurrun <diego@biurrun.de>2012-08-09 20:05:53 +0200
commit2804ba6a3b862be37986b9c2be3bad6bf4ccb6c7 (patch)
tree4b195851b61a1ce3690e49328f963c68abd84887
parent84f9d78a9601671ea9d5ad0e4eefdfc085eadc1f (diff)
downloadffmpeg-2804ba6a3b862be37986b9c2be3bad6bf4ccb6c7.tar.gz
swf: Move swf_audio_codec_tags table to the only place it is used
-rw-r--r--libavformat/swf.h9
-rw-r--r--libavformat/swfdec.c9
2 files changed, 9 insertions, 9 deletions
diff --git a/libavformat/swf.h b/libavformat/swf.h
index 14330c1e08..10a05f51b3 100644
--- a/libavformat/swf.h
+++ b/libavformat/swf.h
@@ -84,13 +84,4 @@ static const AVCodecTag swf_codec_tags[] = {
{ AV_CODEC_ID_NONE, 0},
};
-static const AVCodecTag swf_audio_codec_tags[] = {
- { AV_CODEC_ID_PCM_S16LE, 0x00},
- { AV_CODEC_ID_ADPCM_SWF, 0x01},
- { AV_CODEC_ID_MP3, 0x02},
- { AV_CODEC_ID_PCM_S16LE, 0x03},
- //{ AV_CODEC_ID_NELLYMOSER, 0x06},
- { AV_CODEC_ID_NONE, 0},
-};
-
#endif /* AVFORMAT_SWF_H */
diff --git a/libavformat/swfdec.c b/libavformat/swfdec.c
index 3666f93672..cef486c40f 100644
--- a/libavformat/swfdec.c
+++ b/libavformat/swfdec.c
@@ -23,6 +23,15 @@
#include "libavutil/intreadwrite.h"
#include "swf.h"
+static const AVCodecTag swf_audio_codec_tags[] = {
+ { CODEC_ID_PCM_S16LE, 0x00 },
+ { CODEC_ID_ADPCM_SWF, 0x01 },
+ { CODEC_ID_MP3, 0x02 },
+ { CODEC_ID_PCM_S16LE, 0x03 },
+// { CODEC_ID_NELLYMOSER, 0x06 },
+ { CODEC_ID_NONE, 0 },
+};
+
static int get_swf_tag(AVIOContext *pb, int *len_ptr)
{
int tag, len;