mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
dca: Switch dca_sample_rates to avpriv_ prefix; it is used across libs
This commit is contained in:
parent
faa788227f
commit
19cf7163c1
@ -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
|
||||
|
@ -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 */
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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);
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user