This website works better with JavaScript.
Home
Help
Sign In
falkTX
/
FFmpeg
mirror of
https://github.com/falkTX/FFmpeg.git
Watch
1
Star
0
Fork
0
Code
Issues
0
Releases
338
Wiki
Activity
Browse Source
dca: Switch dca_sample_rates to avpriv_ prefix; it is used across libs
tags/n1.0
Diego Biurrun
13 years ago
parent
faa788227f
commit
19cf7163c1
5 changed files
with
5 additions
and
5 deletions
Split View
Diff Options
Show Stats
Download Patch File
Download Diff File
+1
-1
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
View File
@@ -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
+ 1
- 1
libavcodec/dca.h
View File
@@ -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 */
+ 1
- 1
libavcodec/dca_parser.c
View File
@@ -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;
+ 1
- 1
libavcodec/dcadec.c
View File
@@ -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);
+ 1
- 1
libavformat/spdifenc.c
View File
@@ -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;
Write
Preview
Loading…
Cancel
Save