summaryrefslogtreecommitdiff
path: root/libavformat/wav.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2003-03-08 01:40:52 +0000
committerMichael Niedermayer <michaelni@gmx.at>2003-03-08 01:40:52 +0000
commit7004ffb3d7274fe95fab7a699b75cc4e6d9092e3 (patch)
treeedbfd1f286a815b85278fbfe7d262118d3a19ffe /libavformat/wav.c
parent9bf9a5fcaeffd5a313f97fe9e4c75d8f47f5a149 (diff)
merging fourcc with codec_tag
Originally committed as revision 1645 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/wav.c')
-rw-r--r--libavformat/wav.c3
1 files changed, 1 insertions, 2 deletions
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);