diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-08 14:39:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-08 14:53:01 +0100 |
| commit | 7efee140d7d6fe197a73a178314eacd330a8cc77 (patch) | |
| tree | d6912401d0863841af04daad31c8815b7df4f9c8 | |
| parent | b2b12a1022bd7ed80c84961c3e69c6bd47b1fec8 (diff) | |
get_bits: rename get_bits_longlong to get_bits64
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/flac.c | 2 | ||||
| -rw-r--r-- | libavcodec/get_bits.h | 2 | ||||
| -rw-r--r-- | libavcodec/tak.c | 2 | ||||
| -rw-r--r-- | libavformat/takdec.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/flac.c b/libavcodec/flac.c index 3b803fedb7..f767f6b367 100644 --- a/libavcodec/flac.c +++ b/libavcodec/flac.c @@ -225,7 +225,7 @@ void avpriv_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo * avctx->bits_per_raw_sample = s->bps; 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 */ diff --git a/libavcodec/get_bits.h b/libavcodec/get_bits.h index a1a48ab87d..965d69c061 100644 --- a/libavcodec/get_bits.h +++ b/libavcodec/get_bits.h @@ -320,7 +320,7 @@ static inline unsigned int get_bits_long(GetBitContext *s, int n) /** * 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) return get_bits_long(s, n); diff --git a/libavcodec/tak.c b/libavcodec/tak.c index 7e1a047a2c..e7fbf6bc54 100644 --- a/libavcodec/tak.c +++ b/libavcodec/tak.c @@ -113,7 +113,7 @@ void avpriv_tak_parse_streaminfo(GetBitContext *gb, TAKStreamInfo *s) skip_bits(gb, TAK_ENCODER_PROFILE_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->sample_rate = get_bits(gb, TAK_FORMAT_SAMPLE_RATE_BITS) + TAK_SAMPLE_RATE_MIN; diff --git a/libavformat/takdec.c b/libavformat/takdec.c index a5290173d8..86d98803ab 100644 --- a/libavformat/takdec.c +++ b/libavformat/takdec.c @@ -134,7 +134,7 @@ static int tak_read_header(AVFormatContext *s) if (size != 11) return AVERROR_INVALIDDATA; 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); av_freep(&buffer); } else if (type == TAK_METADATA_ENCODER) { |