swf(dec): replace CODEC_ID with AV_CODEC_ID
authorAnton Khirnov <anton@khirnov.net>
Wed, 15 Aug 2012 07:14:35 +0000 (09:14 +0200)
committerAnton Khirnov <anton@khirnov.net>
Sat, 18 Aug 2012 06:48:30 +0000 (08:48 +0200)
libavformat/swf.c
libavformat/swfdec.c

index 1762991..e6adf69 100644 (file)
@@ -23,7 +23,7 @@
 #include "internal.h"
 
 const AVCodecTag ff_swf_codec_tags[] = {
-    { CODEC_ID_FLV1, 0x02 },
-    { CODEC_ID_VP6F, 0x04 },
-    { CODEC_ID_NONE,    0 },
+    { AV_CODEC_ID_FLV1, 0x02 },
+    { AV_CODEC_ID_VP6F, 0x04 },
+    { AV_CODEC_ID_NONE,    0 },
 };
index 09770f4..6a923f3 100644 (file)
 #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 },
+    { 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 },
 };
 
 static int get_swf_tag(AVIOContext *pb, int *len_ptr)