Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
7efee140
Commit
7efee140
authored
Dec 08, 2012
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
get_bits: rename get_bits_longlong to get_bits64
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
b2b12a10
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
4 deletions
+4
-4
flac.c
libavcodec/flac.c
+1
-1
get_bits.h
libavcodec/get_bits.h
+1
-1
tak.c
libavcodec/tak.c
+1
-1
takdec.c
libavformat/takdec.c
+1
-1
No files found.
libavcodec/flac.c
View file @
7efee140
...
@@ -225,7 +225,7 @@ void avpriv_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo *
...
@@ -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_bits
64
(
&
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 */
...
...
libavcodec/get_bits.h
View file @
7efee140
...
@@ -320,7 +320,7 @@ static inline unsigned int get_bits_long(GetBitContext *s, int n)
...
@@ -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_bits
64
(
GetBitContext
*
s
,
int
n
)
{
{
if
(
n
<=
32
)
if
(
n
<=
32
)
return
get_bits_long
(
s
,
n
);
return
get_bits_long
(
s
,
n
);
...
...
libavcodec/tak.c
View file @
7efee140
...
@@ -113,7 +113,7 @@ void avpriv_tak_parse_streaminfo(GetBitContext *gb, TAKStreamInfo *s)
...
@@ -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_bits
64
(
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
;
...
...
libavformat/takdec.c
View file @
7efee140
...
@@ -134,7 +134,7 @@ static int tak_read_header(AVFormatContext *s)
...
@@ -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_bits
64
(
&
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
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment