highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

create adts stream if CODEC_FLAG_GLOBAL_HEADER not set

Browse Source 
Originally committed as revision 4956 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård 2006-02-08 01:10:07 +00:00
parent fda885c703
commit 86db37df52
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/faac.c
View File

@ -62,14 +62,9 @@ static int Faac_encode_init(AVCodecContext *avctx)
faac_cfg->bitRate = 0; faac_cfg->bitRate = 0;
faac_cfg->quantqual = avctx->global_quality / FF_QP2LAMBDA; faac_cfg->quantqual = avctx->global_quality / FF_QP2LAMBDA;
} }
faac_cfg->outputFormat = 0; faac_cfg->outputFormat = 1;
faac_cfg->inputFormat = FAAC_INPUT_16BIT; faac_cfg->inputFormat = FAAC_INPUT_16BIT;
if (!faacEncSetConfiguration(s->faac_handle, faac_cfg)) {
av_log(avctx, AV_LOG_ERROR, "libfaac doesn't support this output format!\n");
return -1;
}
avctx->frame_size = samples_input / avctx->channels; avctx->frame_size = samples_input / avctx->channels;
avctx->coded_frame= avcodec_alloc_frame(); avctx->coded_frame= avcodec_alloc_frame();
@ -86,9 +81,15 @@ static int Faac_encode_init(AVCodecContext *avctx)
&decoder_specific_info_size)) { &decoder_specific_info_size)) {
avctx->extradata = buffer; avctx->extradata = buffer;
avctx->extradata_size = decoder_specific_info_size; avctx->extradata_size = decoder_specific_info_size;
faac_cfg->outputFormat = 0;
} }
} }
if (!faacEncSetConfiguration(s->faac_handle, faac_cfg)) {
av_log(avctx, AV_LOG_ERROR, "libfaac doesn't support this output format!\n");
return -1;
}
return 0; return 0;
} }