mirror of https://git.ffmpeg.org/ffmpeg.git
get_bits: rename get_bits_longlong to get_bits64
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
b2b12a1022
commit
7efee140d7
|
@ -225,7 +225,7 @@ void avpriv_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo *
|
||||||
avctx->bits_per_raw_sample = s->bps;
|
avctx->bits_per_raw_sample = s->bps;
|
||||||
ff_flac_set_channel_layout(avctx);
|
ff_flac_set_channel_layout(avctx);
|
||||||
|
|
||||||
s->samples = get_bits_longlong(&gb, 36);
|
s->samples = get_bits64(&gb, 36);
|
||||||
|
|
||||||
skip_bits_long(&gb, 64); /* md5 sum */
|
skip_bits_long(&gb, 64); /* md5 sum */
|
||||||
skip_bits_long(&gb, 64); /* md5 sum */
|
skip_bits_long(&gb, 64); /* md5 sum */
|
||||||
|
|
|
@ -320,7 +320,7 @@ static inline unsigned int get_bits_long(GetBitContext *s, int n)
|
||||||
/**
|
/**
|
||||||
* Read 0-64 bits.
|
* Read 0-64 bits.
|
||||||
*/
|
*/
|
||||||
static inline uint64_t get_bits_longlong(GetBitContext *s, int n)
|
static inline uint64_t get_bits64(GetBitContext *s, int n)
|
||||||
{
|
{
|
||||||
if (n <= 32)
|
if (n <= 32)
|
||||||
return get_bits_long(s, n);
|
return get_bits_long(s, n);
|
||||||
|
|
|
@ -113,7 +113,7 @@ void avpriv_tak_parse_streaminfo(GetBitContext *gb, TAKStreamInfo *s)
|
||||||
skip_bits(gb, TAK_ENCODER_PROFILE_BITS);
|
skip_bits(gb, TAK_ENCODER_PROFILE_BITS);
|
||||||
|
|
||||||
frame_type = get_bits(gb, TAK_SIZE_FRAME_DURATION_BITS);
|
frame_type = get_bits(gb, TAK_SIZE_FRAME_DURATION_BITS);
|
||||||
s->samples = get_bits_longlong(gb, TAK_SIZE_SAMPLES_NUM_BITS);
|
s->samples = get_bits64(gb, TAK_SIZE_SAMPLES_NUM_BITS);
|
||||||
|
|
||||||
s->data_type = get_bits(gb, TAK_FORMAT_DATA_TYPE_BITS);
|
s->data_type = get_bits(gb, TAK_FORMAT_DATA_TYPE_BITS);
|
||||||
s->sample_rate = get_bits(gb, TAK_FORMAT_SAMPLE_RATE_BITS) + TAK_SAMPLE_RATE_MIN;
|
s->sample_rate = get_bits(gb, TAK_FORMAT_SAMPLE_RATE_BITS) + TAK_SAMPLE_RATE_MIN;
|
||||||
|
|
|
@ -134,7 +134,7 @@ static int tak_read_header(AVFormatContext *s)
|
||||||
if (size != 11)
|
if (size != 11)
|
||||||
return AVERROR_INVALIDDATA;
|
return AVERROR_INVALIDDATA;
|
||||||
tc->mlast_frame = 1;
|
tc->mlast_frame = 1;
|
||||||
tc->data_end = get_bits_longlong(&gb, TAK_LAST_FRAME_POS_BITS) +
|
tc->data_end = get_bits64(&gb, TAK_LAST_FRAME_POS_BITS) +
|
||||||
get_bits(&gb, TAK_LAST_FRAME_SIZE_BITS);
|
get_bits(&gb, TAK_LAST_FRAME_SIZE_BITS);
|
||||||
av_freep(&buffer);
|
av_freep(&buffer);
|
||||||
} else if (type == TAK_METADATA_ENCODER) {
|
} else if (type == TAK_METADATA_ENCODER) {
|
||||||
|
|
Loading…
Reference in New Issue