virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

flacenc: remove unneeded variable, 'min_encoded_framesize' and use

Browse Source 
'min_framesize' instead

Originally committed as revision 18087 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Justin Ruggles 2009-03-21 00:50:19 +00:00
parent 29b0d168e6
commit b9b4fc5e07
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/flacenc.c
View File

@ -84,7 +84,6 @@ typedef struct FlacEncodeContext {
int samplerate;
int sr_code[2];
int min_framesize;
int min_encoded_framesize;
int max_framesize;
int max_encoded_framesize;
uint32_t frame_count;
@ -364,7 +363,6 @@ static av_cold int flac_encode_init(AVCodecContext *avctx)
} else {
s->max_framesize = 14 + (s->avctx->frame_size * s->channels * 2);
}
s->min_encoded_framesize = 0xFFFFFF;
/* initialize MD5 context */
s->md5ctx = av_malloc(av_md5_size);
@ -378,6 +376,7 @@ static av_cold int flac_encode_init(AVCodecContext *avctx)
avctx->extradata_size = FLAC_STREAMINFO_SIZE;
s->frame_count = 0;
s->min_framesize = s->max_framesize;
avctx->coded_frame = avcodec_alloc_frame();
avctx->coded_frame->key_frame = 1;
@ -1269,7 +1268,6 @@ static int flac_encode_frame(AVCodecContext *avctx, uint8_t *frame,
/* when the last block is reached, update the header in extradata */
if (!data) {
s->min_framesize = s->min_encoded_framesize;
s->max_framesize = s->max_encoded_framesize;
av_md5_final(s->md5ctx, s->md5sum);
write_streaminfo(s, avctx->extradata);
@ -1313,8 +1311,8 @@ write_frame:
update_md5_sum(s, samples);
if (out_bytes > s->max_encoded_framesize)
s->max_encoded_framesize = out_bytes;
if (out_bytes < s->min_encoded_framesize)
s->min_encoded_framesize = out_bytes;
if (out_bytes < s->min_framesize)
s->min_framesize = out_bytes;
return out_bytes;
}