diff options
| author | Diego Biurrun <diego@biurrun.de> | 2012-08-01 11:12:08 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2012-08-01 11:43:31 +0200 |
| commit | 19cf7163c1576e7b03ea33d7bf633e14d7516db8 (patch) | |
| tree | da0153ac734a99ea7999a383335ea20095b58f20 | |
| parent | faa788227f07a8b46059fec70cc5b08118ec1a85 (diff) | |
| download | ffmpeg-19cf7163c1576e7b03ea33d7bf633e14d7516db8.tar.gz | |
dca: Switch dca_sample_rates to avpriv_ prefix; it is used across libs
| -rw-r--r-- | libavcodec/dca.c | 2 | ||||
| -rw-r--r-- | libavcodec/dca.h | 2 | ||||
| -rw-r--r-- | libavcodec/dca_parser.c | 2 | ||||
| -rw-r--r-- | libavcodec/dcadec.c | 2 | ||||
| -rw-r--r-- | libavformat/spdifenc.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/dca.c b/libavcodec/dca.c index 4194f58aa9..0f1eeecf7b 100644 --- a/libavcodec/dca.c +++ b/libavcodec/dca.c @@ -22,7 +22,7 @@ #include "dca.h" -const uint32_t ff_dca_sample_rates[16] = +const uint32_t avpriv_dca_sample_rates[16] = { 0, 8000, 16000, 32000, 0, 0, 11025, 22050, 44100, 0, 0, 12000, 24000, 48000, 96000, 192000 diff --git a/libavcodec/dca.h b/libavcodec/dca.h index 9235fa4f0b..1515270471 100644 --- a/libavcodec/dca.h +++ b/libavcodec/dca.h @@ -36,6 +36,6 @@ /** DCA-HD specific block starts with this marker. */ #define DCA_HD_MARKER 0x64582025 -extern const uint32_t ff_dca_sample_rates[16]; +extern const uint32_t avpriv_dca_sample_rates[16]; #endif /* AVCODEC_DCA_H */ diff --git a/libavcodec/dca_parser.c b/libavcodec/dca_parser.c index 553e69c41c..73611e0233 100644 --- a/libavcodec/dca_parser.c +++ b/libavcodec/dca_parser.c @@ -161,7 +161,7 @@ static int dca_parse_params(const uint8_t *buf, int buf_size, int *duration, skip_bits(&gb, 20); sr_code = get_bits(&gb, 4); - *sample_rate = ff_dca_sample_rates[sr_code]; + *sample_rate = avpriv_dca_sample_rates[sr_code]; if (*sample_rate == 0) return AVERROR_INVALIDDATA; diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c index f488da6d3f..d4fd23e215 100644 --- a/libavcodec/dcadec.c +++ b/libavcodec/dcadec.c @@ -561,7 +561,7 @@ static int dca_parse_frame_header(DCAContext *s) if (s->frame_size < 95) return AVERROR_INVALIDDATA; s->amode = get_bits(&s->gb, 6); - s->sample_rate = ff_dca_sample_rates[get_bits(&s->gb, 4)]; + s->sample_rate = avpriv_dca_sample_rates[get_bits(&s->gb, 4)]; if (!s->sample_rate) return AVERROR_INVALIDDATA; s->bit_rate_index = get_bits(&s->gb, 5); diff --git a/libavformat/spdifenc.c b/libavformat/spdifenc.c index c563008b2e..f8c38c44ab 100644 --- a/libavformat/spdifenc.c +++ b/libavformat/spdifenc.c @@ -252,7 +252,7 @@ static int spdif_header_dts(AVFormatContext *s, AVPacket *pkt) case DCA_MARKER_RAW_BE: blocks = (AV_RB16(pkt->data + 4) >> 2) & 0x7f; core_size = ((AV_RB24(pkt->data + 5) >> 4) & 0x3fff) + 1; - sample_rate = ff_dca_sample_rates[(pkt->data[8] >> 2) & 0x0f]; + sample_rate = avpriv_dca_sample_rates[(pkt->data[8] >> 2) & 0x0f]; break; case DCA_MARKER_RAW_LE: blocks = (AV_RL16(pkt->data + 4) >> 2) & 0x7f; |