diff options
| author | Clément Bœsch <cboesch@gopro.com> | 2017-02-02 13:35:07 +0300 |
|---|---|---|
| committer | Clément Bœsch <cboesch@gopro.com> | 2017-02-02 13:36:34 +0300 |
| commit | f47540523741fdc98f2467e522dc6dac0ade4a0b (patch) | |
| tree | 3956377e5c4bc6fed3a3a1e9471af51cff5a9adf /libavformat/riffdec.c | |
| parent | 5e013586bf9a031275b78aaaba0d97f2319d58a5 (diff) | |
| parent | 7f549b8338ed3775fec4bf10421ff5744e5866dd (diff) | |
Merge commit '7f549b8338ed3775fec4bf10421ff5744e5866dd'
* commit '7f549b8338ed3775fec4bf10421ff5744e5866dd':
riff: don't overwrite bps from WAVEFORMATEX if EXTENSIBLE doesn't contain that data.
Only cosmetics, the change was already present.
Merged-by: Clément Bœsch <cboesch@gopro.com>
Diffstat (limited to 'libavformat/riffdec.c')
| -rw-r--r-- | libavformat/riffdec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/riffdec.c b/libavformat/riffdec.c index 1602c31169..42d9b4ac88 100644 --- a/libavformat/riffdec.c +++ b/libavformat/riffdec.c @@ -61,10 +61,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; - int bps = 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); |