[FFmpeg-cvslog] swf: Move swf_audio_codec_tags table to the only place it is used

Diego Biurrun git at videolan.org
Fri Aug 10 16:31:42 CEST 2012


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Wed Aug  8 15:51:59 2012 +0200| [2804ba6a3b862be37986b9c2be3bad6bf4ccb6c7] | committer: Diego Biurrun

swf: Move swf_audio_codec_tags table to the only place it is used

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2804ba6a3b862be37986b9c2be3bad6bf4ccb6c7
---

 libavformat/swf.h    |    9 ---------
 libavformat/swfdec.c |    9 +++++++++
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/libavformat/swf.h b/libavformat/swf.h
index 14330c1..10a05f5 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 3666f93..cef486c 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;



More information about the ffmpeg-cvslog mailing list