RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Clément Bœsch 2017-02-02 11:35:07 +01:00
parent 5e013586bf 7f549b8338
commit f475405237
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/riffdec.c
View File

@ -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) static void parse_waveformatex(AVIOContext *pb, AVCodecParameters *par)
{ {
ff_asf_guid subformat; ff_asf_guid subformat;
int bps = avio_rl16(pb); int bps;
bps = avio_rl16(pb);
if (bps) if (bps)
par->bits_per_coded_sample = bps; par->bits_per_coded_sample = bps;
par->channel_layout = avio_rl32(pb); /* dwChannelMask */ par->channel_layout = avio_rl32(pb); /* dwChannelMask */
ff_get_guid(pb, &subformat); ff_get_guid(pb, &subformat);