Mercurial > libavformat.hg
changeset 2229:4db0808c3f91 libavformat
ogm: don't use deprecated codec_get_{bmp,wav}_id()
author | mru |
---|---|
date | Sun, 08 Jul 2007 01:41:09 +0000 |
parents | 9c2823ab0146 |
children | 0ff503c4caef |
files | oggparseogm.c |
diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/oggparseogm.c Sun Jul 08 01:41:07 2007 +0000 +++ b/oggparseogm.c Sun Jul 08 01:41:09 2007 +0000 @@ -53,7 +53,7 @@ st->codec->codec_type = CODEC_TYPE_VIDEO; p += 8; tag = bytestream_get_le32(&p); - st->codec->codec_id = codec_get_bmp_id(tag); + st->codec->codec_id = codec_get_id(codec_bmp_tags, tag); st->codec->codec_tag = tag; } else { uint8_t acid[5]; @@ -63,7 +63,7 @@ bytestream_get_buffer(&p, acid, 4); acid[4] = 0; cid = strtol(acid, NULL, 16); - st->codec->codec_id = codec_get_wav_id(cid); + st->codec->codec_id = codec_get_id(codec_wav_tags, cid); } p += 4; /* useless size field */ @@ -110,14 +110,14 @@ if(t == 0x05589f80){ st->codec->codec_type = CODEC_TYPE_VIDEO; - st->codec->codec_id = codec_get_bmp_id(AV_RL32(p + 68)); + st->codec->codec_id = codec_get_id(codec_bmp_tags, AV_RL32(p + 68)); st->codec->time_base.den = 10000000; st->codec->time_base.num = AV_RL64(p + 164); st->codec->width = AV_RL32(p + 176); st->codec->height = AV_RL32(p + 180); } else if(t == 0x05589f81){ st->codec->codec_type = CODEC_TYPE_AUDIO; - st->codec->codec_id = codec_get_wav_id(AV_RL16(p + 124)); + st->codec->codec_id = codec_get_id(codec_wav_tags, AV_RL16(p + 124)); st->codec->channels = AV_RL16(p + 126); st->codec->sample_rate = AV_RL32(p + 128); st->codec->bit_rate = AV_RL32(p + 132) * 8;