diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2012-05-02 16:34:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-21 13:25:50 +0200 |
| commit | 24e7a22e1fda8b5b18307a35f0511e659de76389 (patch) | |
| tree | 4cd924f791d82a277b86e7e0863f5a25f792fd80 /libavformat/riff.c | |
| parent | cb08b6efc90b95c2200ca66850c1ec3b95df34be (diff) | |
| download | ffmpeg-24e7a22e1fda8b5b18307a35f0511e659de76389.tar.gz | |
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
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/riff.c')
| -rw-r--r-- | libavformat/riff.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c index 3fc4fb2d9d..7c91b427d6 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -596,7 +596,9 @@ int ff_get_wav_header(AVIOContext *pb, AVCodecContext *codec, int size) cbSize = FFMIN(size, cbSize); if (cbSize >= 22 && id == 0xfffe) { /* WAVEFORMATEXTENSIBLE */ ff_asf_guid subformat; - codec->bits_per_coded_sample = avio_rl16(pb); + int bps = avio_rl16(pb); + if (bps) + codec->bits_per_coded_sample = bps; codec->channel_layout = avio_rl32(pb); /* dwChannelMask */ ff_get_guid(pb, &subformat); if (!memcmp(subformat + 4, (const uint8_t[]){FF_MEDIASUBTYPE_BASE_GUID}, 12)) { |