diff options
author | Anton Khirnov <anton@khirnov.net> | 2012-08-05 13:11:04 +0400 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2012-08-07 18:00:24 +0400 |
commit | 36ef5369ee9b336febc2c270f8718cec4476cb85 (patch) | |
tree | d186adbb488e7f002aa894743b1ce0e8925520e6 /libavformat/flacdec.c | |
parent | 104e10fb426f903ba9157fdbfe30292d0e4c3d72 (diff) |
Replace all CODEC_ID_* with AV_CODEC_ID_*
Diffstat (limited to 'libavformat/flacdec.c')
-rw-r--r-- | libavformat/flacdec.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c index abb36d9377..f19f95d901 100644 --- a/libavformat/flacdec.c +++ b/libavformat/flacdec.c @@ -31,7 +31,7 @@ static int parse_picture(AVFormatContext *s, uint8_t *buf, int buf_size) { const CodecMime *mime = ff_id3v2_mime_tags; - enum CodecID id = CODEC_ID_NONE; + enum AVCodecID id = AV_CODEC_ID_NONE; uint8_t mimetype[64], *desc = NULL, *data = NULL; AVIOContext *pb = NULL; AVStream *st; @@ -65,14 +65,14 @@ static int parse_picture(AVFormatContext *s, uint8_t *buf, int buf_size) } mimetype[len] = 0; - while (mime->id != CODEC_ID_NONE) { + while (mime->id != AV_CODEC_ID_NONE) { if (!strncmp(mime->str, mimetype, sizeof(mimetype))) { id = mime->id; break; } mime++; } - if (id == CODEC_ID_NONE) { + if (id == AV_CODEC_ID_NONE) { av_log(s, AV_LOG_ERROR, "Unknown attached picture mimetype: %s.\n", mimetype); if (s->error_recognition & AV_EF_EXPLODE) @@ -164,7 +164,7 @@ static int flac_read_header(AVFormatContext *s) if (!st) return AVERROR(ENOMEM); st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = CODEC_ID_FLAC; + st->codec->codec_id = AV_CODEC_ID_FLAC; st->need_parsing = AVSTREAM_PARSE_FULL; /* the parameters will be extracted from the compressed bitstream */ @@ -293,5 +293,5 @@ AVInputFormat ff_flac_demuxer = { .read_packet = ff_raw_read_partial_packet, .flags = AVFMT_GENERIC_INDEX, .extensions = "flac", - .raw_codec_id = CODEC_ID_FLAC, + .raw_codec_id = AV_CODEC_ID_FLAC, }; |