Commit 72c758f1 authored by Diego Biurrun's avatar Diego Biurrun
Browse files

aacenc: Drop some unused function arguments

parent f21d5c90
...@@ -302,7 +302,7 @@ static void encode_ms_info(PutBitContext *pb, ChannelElement *cpe) ...@@ -302,7 +302,7 @@ static void encode_ms_info(PutBitContext *pb, ChannelElement *cpe)
/** /**
* Produce integer coefficients from scalefactors provided by the model. * 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 i, w, w2, g, ch;
int start, maxsfb, cmaxsfb; int start, maxsfb, cmaxsfb;
...@@ -460,8 +460,7 @@ static int encode_individual_channel(AVCodecContext *avctx, AACEncContext *s, ...@@ -460,8 +460,7 @@ static int encode_individual_channel(AVCodecContext *avctx, AACEncContext *s,
/** /**
* Write some auxiliary information about the created AAC file. * Write some auxiliary information about the created AAC file.
*/ */
static void put_bitstream_info(AVCodecContext *avctx, AACEncContext *s, static void put_bitstream_info(AACEncContext *s, const char *name)
const char *name)
{ {
int i, namelen, padbits; int i, namelen, padbits;
...@@ -584,7 +583,7 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, ...@@ -584,7 +583,7 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
init_put_bits(&s->pb, avpkt->data, avpkt->size); init_put_bits(&s->pb, avpkt->data, avpkt->size);
if ((avctx->frame_number & 0xFF)==1 && !(avctx->flags & CODEC_FLAG_BITEXACT)) 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; start_ch = 0;
memset(chan_el_counter, 0, sizeof(chan_el_counter)); memset(chan_el_counter, 0, sizeof(chan_el_counter));
for (i = 0; i < s->chan_map[0]; i++) { for (i = 0; i < s->chan_map[0]; i++) {
...@@ -626,7 +625,7 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, ...@@ -626,7 +625,7 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
s->coder->search_for_ms(s, cpe, s->lambda); s->coder->search_for_ms(s, cpe, s->lambda);
} }
} }
adjust_frame_information(s, cpe, chans); adjust_frame_information(cpe, chans);
if (chans == 2) { if (chans == 2) {
put_bits(&s->pb, 1, cpe->common_window); put_bits(&s->pb, 1, cpe->common_window);
if (cpe->common_window) { if (cpe->common_window) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment