ffmpeg | branch: master | Clément Bœsch <cboe...@gopro.com> | Thu Feb 2 11:35:07 2017 +0100| [f47540523741fdc98f2467e522dc6dac0ade4a0b] | committer: Clément Bœsch
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 <cboe...@gopro.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f47540523741fdc98f2467e522dc6dac0ade4a0b --- libavformat/riffdec.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavformat/riffdec.c b/libavformat/riffdec.c index 1602c31..42d9b4a 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); ====================================================================== _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
