dca: Switch dca_sample_rates to avpriv_ prefix; it is used across libs

Diego Biurrun committed 14 years ago

Commit 19cf7161 parent faa78825 files · +5 −5Browse files

Unified · Split

5 files

libavcodec/dca.c +1 −1
libavcodec/dca.h +1 −1
libavcodec/dca_parser.c +1 −1
libavcodec/dcadec.c +1 −1
libavformat/spdifenc.c +1 −1

libavcodec/dca.c+1−1

@@ -22,7 +22,7 @@ · 21 unmodified lines
22		22
23	#include "dca.h"	23	#include "dca.h"
24		24
25	const uint32_t ff_dca_sample_rates[16] =	25	const uint32_t avpriv_dca_sample_rates[16] =
26	{	26	{
27	0, 8000, 16000, 32000, 0, 0, 11025, 22050, 44100, 0, 0,	27	0, 8000, 16000, 32000, 0, 0, 11025, 22050, 44100, 0, 0,
28	12000, 24000, 48000, 96000, 192000	28	12000, 24000, 48000, 96000, 192000

libavcodec/dca.h+1−1

@@ -36,6 +36,6 @@ · 35 unmodified lines
36	/** DCA-HD specific block starts with this marker. */	36	/** DCA-HD specific block starts with this marker. */
37	#define DCA_HD_MARKER 0x64582025	37	#define DCA_HD_MARKER 0x64582025
38		38
39	extern const uint32_t ff_dca_sample_rates[16];	39	extern const uint32_t avpriv_dca_sample_rates[16];
40		40
41	#endif /* AVCODEC_DCA_H */	41	#endif /* AVCODEC_DCA_H */

libavcodec/dca_parser.c+1−1

@@ -161,7 +161,7 @@ static int dca_parse_params(const uint8_t buf, int buf_size, int duration, · 160 unmodified lines
161		161
162	skip_bits(&gb, 20);	162	skip_bits(&gb, 20);
163	sr_code = get_bits(&gb, 4);	163	sr_code = get_bits(&gb, 4);
164	*sample_rate = ff_dca_sample_rates[sr_code];	164	*sample_rate = avpriv_dca_sample_rates[sr_code];
165	if (*sample_rate == 0)	165	if (*sample_rate == 0)
166	return AVERROR_INVALIDDATA;	166	return AVERROR_INVALIDDATA;
167		167

libavcodec/dcadec.c+1−1

@@ -561,7 +561,7 @@ static int dca_parse_frame_header(DCAContext *s) · 560 unmodified lines
561	if (s->frame_size < 95)	561	if (s->frame_size < 95)
562	return AVERROR_INVALIDDATA;	562	return AVERROR_INVALIDDATA;
563	s->amode = get_bits(&s->gb, 6);	563	s->amode = get_bits(&s->gb, 6);
564	s->sample_rate = ff_dca_sample_rates[get_bits(&s->gb, 4)];	564	s->sample_rate = avpriv_dca_sample_rates[get_bits(&s->gb, 4)];
565	if (!s->sample_rate)	565	if (!s->sample_rate)
566	return AVERROR_INVALIDDATA;	566	return AVERROR_INVALIDDATA;
567	s->bit_rate_index = get_bits(&s->gb, 5);	567	s->bit_rate_index = get_bits(&s->gb, 5);

libavformat/spdifenc.c+1−1

@@ -252,7 +252,7 @@ static int spdif_header_dts(AVFormatContext s, AVPacket pkt) · 251 unmodified lines
252	case DCA_MARKER_RAW_BE:	252	case DCA_MARKER_RAW_BE:
253	blocks = (AV_RB16(pkt->data + 4) >> 2) & 0x7f;	253	blocks = (AV_RB16(pkt->data + 4) >> 2) & 0x7f;
254	core_size = ((AV_RB24(pkt->data + 5) >> 4) & 0x3fff) + 1;	254	core_size = ((AV_RB24(pkt->data + 5) >> 4) & 0x3fff) + 1;
255	sample_rate = ff_dca_sample_rates[(pkt->data[8] >> 2) & 0x0f];	255	sample_rate = avpriv_dca_sample_rates[(pkt->data[8] >> 2) & 0x0f];
256	break;	256	break;
257	case DCA_MARKER_RAW_LE:	257	case DCA_MARKER_RAW_LE:
258	blocks = (AV_RL16(pkt->data + 4) >> 2) & 0x7f;	258	blocks = (AV_RL16(pkt->data + 4) >> 2) & 0x7f;