libpcm: Get unbranded structure tag out of my way.

No functional changes.

Change-Id: If372023cb605389a203a635b700eca20685ad49b

10 files changed, 20 insertions, 20 deletions

diff --git a/lib/rbcodec/codecs/libpcm/dialogic_oki_adpcm.c b/lib/rbcodec/codecs/libpcm/dialogic_oki_adpcm.c
index 60090aaa89..6aa5798e5c 100644
--- a/lib/rbcodec/codecs/libpcm/dialogic_oki_adpcm.c
+++ b/lib/rbcodec/codecs/libpcm/dialogic_oki_adpcm.c
@@ -46,9 +46,9 @@ static const int index_table[] ICONST_ATTR = {
 static struct adpcm_data cur_data;
 static int blocksperchunk;
 
-static struct pcm_format *fmt;
+static struct libpcm_pcm_format *fmt;
 
-static bool set_format(struct pcm_format *format)
+static bool set_format(struct libpcm_pcm_format *format)
 {
     uint32_t max_chunk_count;
 
diff --git a/lib/rbcodec/codecs/libpcm/dvi_adpcm.c b/lib/rbcodec/codecs/libpcm/dvi_adpcm.c
index 2e702ca394..d91bb1b6f6 100644
--- a/lib/rbcodec/codecs/libpcm/dvi_adpcm.c
+++ b/lib/rbcodec/codecs/libpcm/dvi_adpcm.c
@@ -35,9 +35,9 @@
  * [3] ffmpeg source code, libavcodec/adpcm.c
  */
 
-static struct pcm_format *fmt;
+static struct libpcm_pcm_format *fmt;
 
-static bool set_format(struct pcm_format *format)
+static bool set_format(struct libpcm_pcm_format *format)
 {
     fmt = format;
 
diff --git a/lib/rbcodec/codecs/libpcm/ieee_float.c b/lib/rbcodec/codecs/libpcm/ieee_float.c
index 97a7fcecd4..29e145b381 100644
--- a/lib/rbcodec/codecs/libpcm/ieee_float.c
+++ b/lib/rbcodec/codecs/libpcm/ieee_float.c
@@ -26,9 +26,9 @@
  * IEEE float
  */
 
-static struct pcm_format *fmt;
+static struct libpcm_pcm_format *fmt;
 
-static bool set_format(struct pcm_format *format)
+static bool set_format(struct libpcm_pcm_format *format)
 {
     fmt = format;
 
diff --git a/lib/rbcodec/codecs/libpcm/itut_g711.c b/lib/rbcodec/codecs/libpcm/itut_g711.c
index 88ff5f59e6..cbc302ca09 100644
--- a/lib/rbcodec/codecs/libpcm/itut_g711.c
+++ b/lib/rbcodec/codecs/libpcm/itut_g711.c
@@ -106,9 +106,9 @@ static const int16_t ulaw2linear16[256] ICONST_ATTR = {
         24,      16,       8,       0
 };
 
-static struct pcm_format *fmt;
+static struct libpcm_pcm_format *fmt;
 
-static bool set_format(struct pcm_format *format)
+static bool set_format(struct libpcm_pcm_format *format)
 {
     fmt = format;
 
diff --git a/lib/rbcodec/codecs/libpcm/linear_pcm.c b/lib/rbcodec/codecs/libpcm/linear_pcm.c
index 5c3c140b8c..fd0aaeb013 100644
--- a/lib/rbcodec/codecs/libpcm/linear_pcm.c
+++ b/lib/rbcodec/codecs/libpcm/linear_pcm.c
@@ -32,9 +32,9 @@
 #define DEC_DEPTH_32  (32 - PCM_OUTPUT_DEPTH)
 
 
-static struct pcm_format *fmt;
+static struct libpcm_pcm_format *fmt;
 
-static bool set_format(struct pcm_format *format)
+static bool set_format(struct libpcm_pcm_format *format)
 {
     fmt = format;
 
diff --git a/lib/rbcodec/codecs/libpcm/ms_adpcm.c b/lib/rbcodec/codecs/libpcm/ms_adpcm.c
index a385d6c99f..b5fe463c74 100644
--- a/lib/rbcodec/codecs/libpcm/ms_adpcm.c
+++ b/lib/rbcodec/codecs/libpcm/ms_adpcm.c
@@ -37,14 +37,14 @@ static int16_t dec_coeff[2][2];
 static uint16_t delta[2];
 static int16_t sample[2][2];
 
-static struct pcm_format *fmt;
+static struct libpcm_pcm_format *fmt;
 
 static const int16_t adaptation_table[] ICONST_ATTR = {
     230, 230, 230, 230, 307, 409, 512, 614,
     768, 614, 512, 409, 307, 230, 230, 230
 };
 
-static bool set_format(struct pcm_format *format)
+static bool set_format(struct libpcm_pcm_format *format)
 {
     fmt = format;
 
diff --git a/lib/rbcodec/codecs/libpcm/pcm_common.h b/lib/rbcodec/codecs/libpcm/pcm_common.h
index 90e29c98ee..626133dc41 100644
--- a/lib/rbcodec/codecs/libpcm/pcm_common.h
+++ b/lib/rbcodec/codecs/libpcm/pcm_common.h
@@ -47,7 +47,7 @@ else if ((data) < (min)) data = min;
  */
 #define MSADPCM_NUM_COEFF 7
 
-struct pcm_format {
+struct libpcm_pcm_format {
     /*
      * RIFF: wFormatTag (in 'fmt ' chunk)
      * AIFF: compressionType (in 'COMM' chunk)
@@ -138,7 +138,7 @@ struct pcm_codec {
      *     true:  RIFF/AIFF header check OK
      *     false: RIFF/AIFF header check NG
      */
-    bool (*set_format)(struct pcm_format *format);
+    bool (*set_format)(struct libpcm_pcm_format *format);
 
     /*
      * get seek position
diff --git a/lib/rbcodec/codecs/libpcm/qt_ima_adpcm.c b/lib/rbcodec/codecs/libpcm/qt_ima_adpcm.c
index d7b3360eb3..26deb7c045 100644
--- a/lib/rbcodec/codecs/libpcm/qt_ima_adpcm.c
+++ b/lib/rbcodec/codecs/libpcm/qt_ima_adpcm.c
@@ -33,9 +33,9 @@
  * [3] ffmpeg source code, libavcodec/adpcm.c
  */
 
-static struct pcm_format *fmt;
+static struct libpcm_pcm_format *fmt;
 
-static bool set_format(struct pcm_format *format)
+static bool set_format(struct libpcm_pcm_format *format)
 {
     fmt = format;
 
diff --git a/lib/rbcodec/codecs/libpcm/swf_adpcm.c b/lib/rbcodec/codecs/libpcm/swf_adpcm.c
index c440fd1303..7eb74fdd19 100644
--- a/lib/rbcodec/codecs/libpcm/swf_adpcm.c
+++ b/lib/rbcodec/codecs/libpcm/swf_adpcm.c
@@ -45,11 +45,11 @@ static int blockbits = 0;
 static int lastbytebits = 0;
 static bool after_seek = false;
 
-static struct pcm_format *fmt;
+static struct libpcm_pcm_format *fmt;
 
 #define GET_SAMPLE_COUNT(s) ((((s) << 3) / fmt->channels - 22) / fmt->bitspersample + 1)
 
-static bool set_format(struct pcm_format *format)
+static bool set_format(struct libpcm_pcm_format *format)
 {
     fmt = format;
 
diff --git a/lib/rbcodec/codecs/libpcm/yamaha_adpcm.c b/lib/rbcodec/codecs/libpcm/yamaha_adpcm.c
index c67fe7524a..946d7ed0ec 100644
--- a/lib/rbcodec/codecs/libpcm/yamaha_adpcm.c
+++ b/lib/rbcodec/codecs/libpcm/yamaha_adpcm.c
@@ -76,9 +76,9 @@ static bool has_block_header = false;
 static struct adpcm_data cur_data;
 static int blocksperchunk;
 
-static struct pcm_format *fmt;
+static struct libpcm_pcm_format *fmt;
 
-static bool set_format(struct pcm_format *format)
+static bool set_format(struct libpcm_pcm_format *format)
 {
     fmt = format;