Merge branch 'v0.21.x' into master

2020-09-21 11:37:30 +02:00
parent 7552f70c8d b72801abf3
commit 7c8427b0f7
7 changed files with 39 additions and 8 deletions
--- a/src/decoder/plugins/OpusHead.cxx
+++ b/src/decoder/plugins/OpusHead.cxx
@@ -33,12 +33,14 @@ struct OpusHead {

 bool
 ScanOpusHeader(const void *data, size_t size, unsigned &channels_r,
-	       unsigned &pre_skip_r)
+	       signed &output_gain_r, unsigned &pre_skip_r)
 {
 	const auto *h = (const OpusHead *)data;
 	if (size < 19 || (h->version & 0xf0) != 0)
 		return false;

+	output_gain_r = FromLE16S(h->output_gain);
+
 	channels_r = h->channels;
 	pre_skip_r = FromLE16(h->pre_skip);
 	return true;