[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec faac.c,1.7,1.8
Måns Rullgård CVS
mru
Wed Feb 8 02:10:10 CET 2006
Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
In directory mail:/var2/tmp/cvs-serv21365
Modified Files:
faac.c
Log Message:
create adts stream if CODEC_FLAG_GLOBAL_HEADER not set
Index: faac.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/faac.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- faac.c 12 Jan 2006 22:43:15 -0000 1.7
+++ faac.c 8 Feb 2006 01:10:07 -0000 1.8
@@ -62,14 +62,9 @@
faac_cfg->bitRate = 0;
faac_cfg->quantqual = avctx->global_quality / FF_QP2LAMBDA;
}
- faac_cfg->outputFormat = 0;
+ faac_cfg->outputFormat = 1;
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->coded_frame= avcodec_alloc_frame();
@@ -86,9 +81,15 @@
&decoder_specific_info_size)) {
avctx->extradata = buffer;
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;
}
More information about the ffmpeg-cvslog
mailing list