X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=opus_common.c;h=374df8375acffda9fa637999f4ecad7f2321535b;hb=9250014c8716067517819351ad38b2485a2505e1;hp=67a8841e8b8ce7fe172043a144332cb1db4c577f;hpb=c311eae67481b400bccac0bfe71d6cad846db2fc;p=paraslash.git

diff --git a/opus_common.c b/opus_common.c
index 67a8841e..374df837 100644
--- a/opus_common.c
+++ b/opus_common.c
@@ -62,7 +62,7 @@ static int read_uint32(struct packet *p, ogg_uint32_t *val)
 	return 1;
 }
 
-static int read_uint16(struct packet *p, ogg_uint16_t *val)
+static int read_uint16(struct packet *p, uint16_t *val)
 {
 	if (p->pos > p->maxlen - 2)
 		return 0;
@@ -89,7 +89,6 @@ int opus_parse_header(const char *packet, int len, struct opus_header *h)
 	char str[9];
 	struct packet p;
 	unsigned char ch, channel_mapping;
-	ogg_uint16_t shortval;
 
 	p.data = packet;
 	p.maxlen = len;
@@ -113,16 +112,14 @@ int opus_parse_header(const char *packet, int len, struct opus_header *h)
 	if (h->channels == 0)
 		return -E_OPUS_HEADER;
 
-	if (!read_uint16(&p, &shortval))
+	if (!read_uint16(&p, &h->preskip))
 		return -E_OPUS_HEADER;
-	h->preskip = shortval;
 
 	if (!read_uint32(&p, &h->input_sample_rate))
 		return -E_OPUS_HEADER;
 
-	if (!read_uint16(&p, &shortval))
+	if (!read_uint16(&p, &h->gain))
 		return -E_OPUS_HEADER;
-	h->gain = (short)shortval;
 
 	if (!read_chars(&p, &ch, 1))
 		return -E_OPUS_HEADER;