diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2003-03-08 01:40:52 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2003-03-08 01:40:52 +0000 |
| commit | 7004ffb3d7274fe95fab7a699b75cc4e6d9092e3 (patch) | |
| tree | edbfd1f286a815b85278fbfe7d262118d3a19ffe /libavformat | |
| parent | 9bf9a5fcaeffd5a313f97fe9e4c75d8f47f5a149 (diff) | |
merging fourcc with codec_tag
Originally committed as revision 1645 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/asf.c | 2 | ||||
| -rw-r--r-- | libavformat/wav.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/libavformat/asf.c b/libavformat/asf.c index 4d4c74571f..5edde52ca5 100644 --- a/libavformat/asf.c +++ b/libavformat/asf.c @@ -897,7 +897,7 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap) 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); diff --git a/libavformat/wav.c b/libavformat/wav.c index 25e779307b..7fe2f8e73b 100644 --- a/libavformat/wav.c +++ b/libavformat/wav.c @@ -111,12 +111,11 @@ void get_wav_header(ByteIOContext *pb, AVCodecContext *codec, 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); |