Mercurial > libavformat.hg
changeset 74:4b501fe1539c libavformat
merging fourcc with codec_tag
author | michaelni |
---|---|
date | Sat, 08 Mar 2003 01:40:52 +0000 |
parents | d40ddc73858a |
children | 78bec272ce3a |
files | asf.c wav.c |
diffstat | 2 files changed, 2 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/asf.c Sat Mar 08 00:44:52 2003 +0000 +++ b/asf.c Sat Mar 08 01:40:52 2003 +0000 @@ -897,7 +897,7 @@ st->codec.extradata = av_mallocz(st->codec.extradata_size); get_buffer(pb, st->codec.extradata, st->codec.extradata_size); } - st->codec.codec_tag = st->codec.fourcc = tag1; + st->codec.codec_tag = tag1; st->codec.codec_id = codec_get_id(codec_bmp_tags, tag1); } pos2 = url_ftell(pb);
--- a/wav.c Sat Mar 08 00:44:52 2003 +0000 +++ b/wav.c Sat Mar 08 01:40:52 2003 +0000 @@ -111,12 +111,11 @@ id = get_le16(pb); codec->codec_type = CODEC_TYPE_AUDIO; codec->codec_tag = id; - codec->fourcc = id; codec->channels = get_le16(pb); codec->sample_rate = get_le32(pb); codec->bit_rate = get_le32(pb) * 8; codec->block_align = get_le16(pb); - codec->frame_bits = get_le16(pb); /* bits per sample */ + codec->bits_per_sample = get_le16(pb); /* bits per sample */ codec->codec_id = wav_codec_get_id(id, codec->frame_bits); if (has_extra_data) { codec->extradata_size = get_le16(pb);