1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

mpegaudioenc: Remove write-only variables from the context.

Patch by Rafaël Carré (rafael <dot> carre <at> gmail).

Originally committed as revision 23926 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Rafaël Carré 2010-07-01 05:17:02 +00:00 committed by Jai Menon
parent 0c0fd063dd
commit b47a52dc86

View File

@ -40,12 +40,10 @@
typedef struct MpegAudioContext { typedef struct MpegAudioContext {
PutBitContext pb; PutBitContext pb;
int nb_channels; int nb_channels;
int freq, bit_rate;
int lsf; /* 1 if mpeg2 low bitrate selected */ int lsf; /* 1 if mpeg2 low bitrate selected */
int bitrate_index; /* bit rate */ int bitrate_index; /* bit rate */
int freq_index; int freq_index;
int frame_size; /* frame size, in bits, without padding */ int frame_size; /* frame size, in bits, without padding */
int64_t nb_samples; /* total number of samples encoded */
/* padding computation */ /* padding computation */
int frame_frac, frame_frac_incr, do_padding; int frame_frac, frame_frac_incr, do_padding;
short samples_buf[MPA_MAX_CHANNELS][SAMPLES_BUF_SIZE]; /* buffer for filter */ short samples_buf[MPA_MAX_CHANNELS][SAMPLES_BUF_SIZE]; /* buffer for filter */
@ -79,8 +77,6 @@ static av_cold int MPA_encode_init(AVCodecContext *avctx)
} }
bitrate = bitrate / 1000; bitrate = bitrate / 1000;
s->nb_channels = channels; s->nb_channels = channels;
s->freq = freq;
s->bit_rate = bitrate * 1000;
avctx->frame_size = MPA_FRAME_SIZE; avctx->frame_size = MPA_FRAME_SIZE;
/* encoding freq */ /* encoding freq */
@ -778,7 +774,6 @@ static int MPA_encode_frame(AVCodecContext *avctx,
encode_frame(s, bit_alloc, padding); encode_frame(s, bit_alloc, padding);
s->nb_samples += MPA_FRAME_SIZE;
return put_bits_ptr(&s->pb) - s->pb.buf; return put_bits_ptr(&s->pb) - s->pb.buf;
} }