Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
external
ffmpeg
Commits
72c758f1
Commit
72c758f1
authored
Oct 24, 2012
by
Diego Biurrun
Browse files
aacenc: Drop some unused function arguments
parent
f21d5c90
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
5 deletions
+4
-5
libavcodec/aacenc.c
libavcodec/aacenc.c
+4
-5
No files found.
libavcodec/aacenc.c
View file @
72c758f1
...
...
@@ -302,7 +302,7 @@ static void encode_ms_info(PutBitContext *pb, ChannelElement *cpe)
/**
* Produce integer coefficients from scalefactors provided by the model.
*/
static
void
adjust_frame_information
(
AACEncContext
*
apc
,
ChannelElement
*
cpe
,
int
chans
)
static
void
adjust_frame_information
(
ChannelElement
*
cpe
,
int
chans
)
{
int
i
,
w
,
w2
,
g
,
ch
;
int
start
,
maxsfb
,
cmaxsfb
;
...
...
@@ -460,8 +460,7 @@ static int encode_individual_channel(AVCodecContext *avctx, AACEncContext *s,
/**
* Write some auxiliary information about the created AAC file.
*/
static
void
put_bitstream_info
(
AVCodecContext
*
avctx
,
AACEncContext
*
s
,
const
char
*
name
)
static
void
put_bitstream_info
(
AACEncContext
*
s
,
const
char
*
name
)
{
int
i
,
namelen
,
padbits
;
...
...
@@ -584,7 +583,7 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
init_put_bits
(
&
s
->
pb
,
avpkt
->
data
,
avpkt
->
size
);
if
((
avctx
->
frame_number
&
0xFF
)
==
1
&&
!
(
avctx
->
flags
&
CODEC_FLAG_BITEXACT
))
put_bitstream_info
(
avctx
,
s
,
LIBAVCODEC_IDENT
);
put_bitstream_info
(
s
,
LIBAVCODEC_IDENT
);
start_ch
=
0
;
memset
(
chan_el_counter
,
0
,
sizeof
(
chan_el_counter
));
for
(
i
=
0
;
i
<
s
->
chan_map
[
0
];
i
++
)
{
...
...
@@ -626,7 +625,7 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
s
->
coder
->
search_for_ms
(
s
,
cpe
,
s
->
lambda
);
}
}
adjust_frame_information
(
s
,
cpe
,
chans
);
adjust_frame_information
(
cpe
,
chans
);
if
(
chans
==
2
)
{
put_bits
(
&
s
->
pb
,
1
,
cpe
->
common_window
);
if
(
cpe
->
common_window
)
{
...
...
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