Skip to content

F
ffmpeg
Commit e0ece99a authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

sorry forgot 

Originally committed as revision 1671 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent cf2818b0
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 5 deletions
libavformat/wav.c
View file @ e0ece99a
...@@ -115,7 +115,6 @@ void get_wav_header(ByteIOContext *pb, AVCodecContext *codec, int size) ...@@ -115,7 +115,6 @@ void get_wav_header(ByteIOContext *pb, AVCodecContext *codec, int size)
int id; int id;
id = get_le16(pb); id = get_le16(pb);
codec->codec_id = wav_codec_get_id(id, codec->frame_bits);
codec->codec_type = CODEC_TYPE_AUDIO; codec->codec_type = CODEC_TYPE_AUDIO;
codec->codec_tag = id; codec->codec_tag = id;
codec->channels = get_le16(pb); codec->channels = get_le16(pb);
...@@ -124,10 +123,10 @@ void get_wav_header(ByteIOContext *pb, AVCodecContext *codec, int size) ...@@ -124,10 +123,10 @@ void get_wav_header(ByteIOContext *pb, AVCodecContext *codec, int size)
codec->block_align = get_le16(pb); codec->block_align = get_le16(pb);
if (size == 14) { /* We're dealing with plain vanilla WAVEFORMAT */ if (size == 14) { /* We're dealing with plain vanilla WAVEFORMAT */
codec->bits_per_sample = 8; codec->bits_per_sample = 8;
return; }else
} codec->bits_per_sample = get_le16(pb);
codec->codec_id = wav_codec_get_id(id, codec->bits_per_sample);
codec->bits_per_sample = get_le16(pb);
if (size > 16) { /* We're obviously dealing with WAVEFORMATEX */ if (size > 16) { /* We're obviously dealing with WAVEFORMATEX */
codec->extradata_size = get_le16(pb); codec->extradata_size = get_le16(pb);
if (codec->extradata_size > 0) { if (codec->extradata_size > 0) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment