From: Andre Noll <maan@tuebingen.mpg.de>
Date: Mon, 14 Mar 2016 08:00:28 +0000 (+0100)
Subject: opus: Make opus_common.[ch] independent of ogg.h.
X-Git-Tag: v0.5.6~19^2
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=8addac4aca5f29db18d5beb21f464e4744c97bb7

opus: Make opus_common.[ch] independent of ogg.h.

The only reason opus_common.c includes ogg.h is that struct opus_header
contains a variable of type ogg_uint32_t. By using plain uint32_t
instead we may get rid of the include.
---

diff --git a/opus_common.c b/opus_common.c
index 374df837..f4e18df9 100644
--- a/opus_common.c
+++ b/opus_common.c
@@ -29,8 +29,6 @@
  * handler.
  */
 
-#include <ogg/ogg.h>
-
 #include "para.h"
 #include "error.h"
 #include "opus_common.h"
@@ -53,7 +51,7 @@ static int read_chars(struct packet *p, unsigned char *str, int nb_chars)
 	return 1;
 }
 
-static int read_uint32(struct packet *p, ogg_uint32_t *val)
+static int read_uint32(struct packet *p, uint32_t *val)
 {
 	if (p->pos > p->maxlen - 4)
 		return 0;
diff --git a/opus_common.h b/opus_common.h
index bdc67edd..2160f151 100644
--- a/opus_common.h
+++ b/opus_common.h
@@ -18,7 +18,7 @@ struct opus_header {
 	/** Number of bytes to skip from the beginning. */
 	uint16_t preskip;
 	/** Sample rate of the input stream, used by the audio format handler. */
-	ogg_uint32_t input_sample_rate;
+	uint32_t input_sample_rate;
 	/** In dB, should be zero whenever possible. */
 	uint16_t gain;
 	/** Number of logical streams (usually 1). */