* commit '7f549b8338ed3775fec4bf10421ff5744e5866dd': riff: don't overwrite bps from WAVEFORMATEX if EXTENSIBLE doesn't contain that data. Only cosmetics, the change was already present.
Unified · Split
| @@ -61,10 +61,11 @@ enum AVCodecID ff_codec_guid_get_id(const AVCodecGuid *guids, ff_asf_guid guid) · 60 unmodified lines | |||
| 61 | static void parse_waveformatex(AVIOContext *pb, AVCodecParameters *par) | 61 | static void parse_waveformatex(AVIOContext *pb, AVCodecParameters *par) |
| 62 | { | 62 | { |
| 63 | ff_asf_guid subformat; | 63 | ff_asf_guid subformat; |
| 64 | int bps = avio_rl16(pb); | 64 | int bps; |
| 65 | |||
| 66 | bps = avio_rl16(pb); | ||
| 65 | if (bps) | 67 | if (bps) |
| 66 | par->bits_per_coded_sample = bps; | 68 | par->bits_per_coded_sample = bps; |
| 67 | |||
| 68 | par->channel_layout = avio_rl32(pb); /* dwChannelMask */ | 69 | par->channel_layout = avio_rl32(pb); /* dwChannelMask */ |
| 69 | 70 | ||
| 70 | ff_get_guid(pb, &subformat); | 71 | ff_get_guid(pb, &subformat); |