aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2012-08-05 11:11:04 +0200
committerAnton Khirnov <anton@khirnov.net>2012-08-07 16:00:24 +0200
commit36ef5369ee9b336febc2c270f8718cec4476cb85 (patch)
treed186adbb488e7f002aa894743b1ce0e8925520e6 /tools
parent104e10fb426f903ba9157fdbfe30292d0e4c3d72 (diff)
downloadffmpeg-36ef5369ee9b336febc2c270f8718cec4476cb85.tar.gz
Replace all CODEC_ID_* with AV_CODEC_ID_*
Diffstat (limited to 'tools')
-rw-r--r--tools/ismindex.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/ismindex.c b/tools/ismindex.c
index 54c49dc2f5..f6b0c6cca7 100644
--- a/tools/ismindex.c
+++ b/tools/ismindex.c
@@ -248,7 +248,7 @@ static int get_video_private_data(struct VideoFile *vf, AVCodecContext *codec)
uint16_t sps_size, pps_size;
int err = AVERROR(EINVAL);
- if (codec->codec_id == CODEC_ID_VC1)
+ if (codec->codec_id == AV_CODEC_ID_VC1)
return get_private_data(vf, codec);
avio_open_dyn_buf(&io);
@@ -332,11 +332,11 @@ static int handle_file(struct VideoFiles *files, const char *file, int split)
files->nb_audio_files++;
vf->channels = st->codec->channels;
vf->sample_rate = st->codec->sample_rate;
- if (st->codec->codec_id == CODEC_ID_AAC) {
+ if (st->codec->codec_id == AV_CODEC_ID_AAC) {
vf->fourcc = "AACL";
vf->tag = 255;
vf->blocksize = 4;
- } else if (st->codec->codec_id == CODEC_ID_WMAPRO) {
+ } else if (st->codec->codec_id == AV_CODEC_ID_WMAPRO) {
vf->fourcc = "WMAP";
vf->tag = st->codec->codec_tag;
vf->blocksize = st->codec->block_align;
@@ -349,9 +349,9 @@ static int handle_file(struct VideoFiles *files, const char *file, int split)
files->nb_video_files++;
vf->width = st->codec->width;
vf->height = st->codec->height;
- if (st->codec->codec_id == CODEC_ID_H264)
+ if (st->codec->codec_id == AV_CODEC_ID_H264)
vf->fourcc = "H264";
- else if (st->codec->codec_id == CODEC_ID_VC1)
+ else if (st->codec->codec_id == AV_CODEC_ID_VC1)
vf->fourcc = "WVC1";
get_video_private_data(vf, st->codec);
}