From 7f549b8338ed3775fec4bf10421ff5744e5866dd Mon Sep 17 00:00:00 2001 From: Hendrik Leppkes Date: Wed, 2 May 2012 16:34:45 +0200 Subject: riff: don't overwrite bps from WAVEFORMATEX if EXTENSIBLE doesn't contain that data. According to the specification on the MSDN [1], 0 is valid for that particular field, and it should be ignored in that case. [1]: http://msdn.microsoft.com/en-us/library/windows/desktop/dd757714(v=vs.85).aspx Bug-Id: 950 Signed-off-by: Anton Khirnov --- libavformat/riffdec.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'libavformat') diff --git a/libavformat/riffdec.c b/libavformat/riffdec.c index 531413c943..81248355e3 100644 --- a/libavformat/riffdec.c +++ b/libavformat/riffdec.c @@ -57,7 +57,11 @@ enum AVCodecID ff_codec_guid_get_id(const AVCodecGuid *guids, ff_asf_guid guid) static void parse_waveformatex(AVIOContext *pb, AVCodecParameters *par) { ff_asf_guid subformat; - par->bits_per_coded_sample = avio_rl16(pb); + int bps; + + bps = avio_rl16(pb); + if (bps) + par->bits_per_coded_sample = bps; par->channel_layout = avio_rl32(pb); /* dwChannelMask */ ff_get_guid(pb, &subformat); -- cgit v1.2.3