[FFmpeg-cvslog] swf(dec): replace CODEC_ID with AV_CODEC_ID
Anton Khirnov
git at videolan.org
Sat Aug 18 15:26:29 CEST 2012
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Wed Aug 15 09:14:35 2012 +0200| [15c71dfd03a699a9ce503bf061d58b88ec49d860] | committer: Anton Khirnov
swf(dec): replace CODEC_ID with AV_CODEC_ID
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=15c71dfd03a699a9ce503bf061d58b88ec49d860
---
libavformat/swf.c | 6 +++---
libavformat/swfdec.c | 12 ++++++------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/libavformat/swf.c b/libavformat/swf.c
index 1762991..e6adf69 100644
--- a/libavformat/swf.c
+++ b/libavformat/swf.c
@@ -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 },
};
diff --git a/libavformat/swfdec.c b/libavformat/swfdec.c
index 09770f4..6a923f3 100644
--- a/libavformat/swfdec.c
+++ b/libavformat/swfdec.c
@@ -24,12 +24,12 @@
#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)
More information about the ffmpeg-cvslog
mailing list