Flush final frames in libfaac encoder.

Gives decoded output identical in length to faac commandline encoder.
Fixes Issue 670.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 243f8241db)
This commit is contained in:
Justin Ruggles 2011-01-29 18:45:32 +00:00 committed by Michael Niedermayer
parent 5255acc6be
commit 4592c85fc8
1 changed files with 3 additions and 1 deletions

View File

@ -124,10 +124,11 @@ static int Faac_encode_frame(AVCodecContext *avctx,
{
FaacAudioContext *s = avctx->priv_data;
int bytes_written;
int num_samples = data ? avctx->frame_size : 0;
bytes_written = faacEncEncode(s->faac_handle,
data,
avctx->frame_size * avctx->channels,
num_samples * avctx->channels,
frame,
buf_size);
@ -161,6 +162,7 @@ AVCodec ff_libfaac_encoder = {
Faac_encode_init,
Faac_encode_frame,
Faac_encode_close,
.capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY,
.sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},
.long_name = NULL_IF_CONFIG_SMALL("libfaac AAC (Advanced Audio Codec)"),
.profiles = NULL_IF_CONFIG_SMALL(profiles),