Mercurial > libavformat.hg
diff vocdec.c @ 3764:9cff515fd4c6 libavformat
voc: add ff_ prefix to some global const data
| author | aurel |
|---|---|
| date | Sun, 24 Aug 2008 14:12:03 +0000 |
| parents | 7a0230981402 |
| children | f062deeedb8d |
line wrap: on
line diff
--- a/vocdec.c Sun Aug 24 14:02:55 2008 +0000 +++ b/vocdec.c Sun Aug 24 14:12:03 2008 +0000 @@ -26,7 +26,7 @@ { 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 @@ 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 @@ 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 @@ 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}, };