diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2008-08-24 14:12:03 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2008-08-24 14:12:03 +0000 |
| commit | 090a41790e10d6903e1ccee21f153b9558390cd6 (patch) | |
| tree | 596025777a95c6f17a347dc998400a56d719307b /libavformat/vocdec.c | |
| parent | e7fd7b9aecc16150b445ddeb0baf251ef272ddbe (diff) | |
| download | ffmpeg-090a41790e10d6903e1ccee21f153b9558390cd6.tar.gz | |
voc: add ff_ prefix to some global const data
Originally committed as revision 14945 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/vocdec.c')
| -rw-r--r-- | libavformat/vocdec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/vocdec.c b/libavformat/vocdec.c index 06ef0c37bf..afba3c56b1 100644 --- 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}, }; |