diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2009-04-16 02:28:49 +0000 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2009-04-16 02:28:49 +0000 |
| commit | 0bc08ed941f7663b6345b59faf73ad13f615834a (patch) | |
| tree | 567c0cb49db2178e656e08584c0791acf2e320f1 /libavcodec/flacenc.c | |
| parent | 799a0722fc83ea9f6ef3df54628ecb1bf282c915 (diff) | |
| download | ffmpeg-0bc08ed941f7663b6345b59faf73ad13f615834a.tar.gz | |
flacenc: write initial blocksize to STREAMINFO header instead of current
blocksize.
Originally committed as revision 18532 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/flacenc.c')
| -rw-r--r-- | libavcodec/flacenc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c index e8e5674bce..66e5bfafcf 100644 --- a/libavcodec/flacenc.c +++ b/libavcodec/flacenc.c @@ -83,6 +83,7 @@ typedef struct FlacEncodeContext { int channels; int samplerate; int sr_code[2]; + int max_blocksize; int min_framesize; int max_framesize; int max_encoded_framesize; @@ -107,8 +108,8 @@ static void write_streaminfo(FlacEncodeContext *s, uint8_t *header) init_put_bits(&pb, header, FLAC_STREAMINFO_SIZE); /* streaminfo metadata block */ - put_bits(&pb, 16, s->avctx->frame_size); - put_bits(&pb, 16, s->avctx->frame_size); + put_bits(&pb, 16, s->max_blocksize); + put_bits(&pb, 16, s->max_blocksize); put_bits(&pb, 24, s->min_framesize); put_bits(&pb, 24, s->max_framesize); put_bits(&pb, 20, s->samplerate); @@ -326,6 +327,7 @@ static av_cold int flac_encode_init(AVCodecContext *avctx) } else { s->avctx->frame_size = select_blocksize(s->samplerate, s->options.block_time_ms); } + s->max_blocksize = s->avctx->frame_size; av_log(avctx, AV_LOG_DEBUG, " block size: %d\n", s->avctx->frame_size); /* set LPC precision */ |