voc: add ff_ prefix to some global const data

Originally committed as revision 14945 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/voc.c b/libavformat/voc.c
index 750f78d..7ebfa71 100644 (file)
--- a/libavformat/voc.c
+++ b/libavformat/voc.c
@@ -21,9 +21,9 @@
 
 #include "voc.h"
 
-const unsigned char voc_magic[21] = "Creative Voice File\x1A";
+const unsigned char ff_voc_magic[21] = "Creative Voice File\x1A";
 
-const AVCodecTag voc_codec_tags[] = {
+const AVCodecTag ff_voc_codec_tags[] = {
     {CODEC_ID_PCM_U8,        0x00},
     {CODEC_ID_ADPCM_SBPRO_4, 0x01},
     {CODEC_ID_ADPCM_SBPRO_3, 0x02},

diff --git a/libavformat/voc.h b/libavformat/voc.h
index 606f215..5f6998a 100644 (file)
--- a/libavformat/voc.h
+++ b/libavformat/voc.h
@@ -42,8 +42,8 @@ typedef enum voc_type {
     VOC_TYPE_NEW_VOICE_DATA   = 0x09,
 } voc_type_t;
 
-extern const unsigned char voc_magic[21];
-extern const AVCodecTag voc_codec_tags[];
+extern const unsigned char ff_voc_magic[21];
+extern const AVCodecTag ff_voc_codec_tags[];
 
 int voc_get_packet(AVFormatContext *s, AVPacket *pkt,
                    AVStream *st, int max_size);

diff --git a/libavformat/vocdec.c b/libavformat/vocdec.c
index 06ef0c3..afba3c5 100644 (file)
--- a/libavformat/vocdec.c
+++ b/libavformat/vocdec.c
@@ -26,7 +26,7 @@ static int voc_probe(AVProbeData *p)
 {
     int version, check;
 
-    if (memcmp(p->buf, voc_magic, sizeof(voc_magic) - 1))
+    if (memcmp(p->buf, ff_voc_magic, sizeof(ff_voc_magic) - 1))
         return 0;
     version = AV_RL16(p->buf + 22);
     check = AV_RL16(p->buf + 24);
@@ -83,7 +83,7 @@ voc_get_packet(AVFormatContext *s, AVPacket *pkt, AVStream *st, int max_size)
             if (sample_rate)
                 dec->sample_rate = sample_rate;
             dec->channels = channels;
-            dec->codec_id = codec_get_id(voc_codec_tags, get_byte(pb));
+            dec->codec_id = codec_get_id(ff_voc_codec_tags, get_byte(pb));
             dec->bits_per_sample = av_get_bits_per_sample(dec->codec_id);
             voc->remaining_size -= 2;
             max_size -= 2;
@@ -106,7 +106,7 @@ voc_get_packet(AVFormatContext *s, AVPacket *pkt, AVStream *st, int max_size)
             dec->sample_rate = get_le32(pb);
             dec->bits_per_sample = get_byte(pb);
             dec->channels = get_byte(pb);
-            dec->codec_id = codec_get_id(voc_codec_tags, get_le16(pb));
+            dec->codec_id = codec_get_id(ff_voc_codec_tags, get_le16(pb));
             url_fskip(pb, 4);
             voc->remaining_size -= 12;
             max_size -= 12;
@@ -141,5 +141,5 @@ AVInputFormat voc_demuxer = {
     voc_probe,
     voc_read_header,
     voc_read_packet,
-    .codec_tag=(const AVCodecTag*[]){voc_codec_tags, 0},
+    .codec_tag=(const AVCodecTag*[]){ff_voc_codec_tags, 0},
 };

diff --git a/libavformat/vocenc.c b/libavformat/vocenc.c
index a96dfc7..88fc41c 100644 (file)
--- a/libavformat/vocenc.c
+++ b/libavformat/vocenc.c
@@ -36,7 +36,7 @@ static int voc_write_header(AVFormatContext *s)
         || s->streams[0]->codec->codec_type != CODEC_TYPE_AUDIO)
         return AVERROR_PATCHWELCOME;
 
-    put_buffer(pb, voc_magic, sizeof(voc_magic) - 1);
+    put_buffer(pb, ff_voc_magic, sizeof(ff_voc_magic) - 1);
     put_le16(pb, header_size);
     put_le16(pb, version);
     put_le16(pb, ~version + 0x1234);
@@ -99,5 +99,5 @@ AVOutputFormat voc_muxer = {
     voc_write_header,
     voc_write_packet,
     voc_write_trailer,
-    .codec_tag=(const AVCodecTag*[]){voc_codec_tags, 0},
+    .codec_tag=(const AVCodecTag*[]){ff_voc_codec_tags, 0},
 };