vlc/vlc-2.0 | branch: master | Rui Zhang <bbcal...@gmail.com> | Sat May 19 20:59:28 2012 +0800| [a27a39a740485ae78d7cf392274df8446f85f6f6] | committer: Jean-Baptiste Kempf
Avcodec: disable delayed opening for packetized AAC data This is usually not visible, since you need avcodec+avformat, instead of ts/faad. Close #6847 Signed-off-by: Jean-Baptiste Kempf <j...@videolan.org> (cherry picked from commit e0a4ac832b5214561944cd8212d7a94ad5d0ce87) Signed-off-by: Jean-Baptiste Kempf <j...@videolan.org> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=a27a39a740485ae78d7cf392274df8446f85f6f6 --- modules/codec/avcodec/avcodec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/codec/avcodec/avcodec.c b/modules/codec/avcodec/avcodec.c index 072e0bf..f604a38 100644 --- a/modules/codec/avcodec/avcodec.c +++ b/modules/codec/avcodec/avcodec.c @@ -423,7 +423,8 @@ int ffmpeg_OpenCodec( decoder_t *p_dec ) if( p_sys->i_codec_id == CODEC_ID_VC1 || p_sys->i_codec_id == CODEC_ID_VORBIS || p_sys->i_codec_id == CODEC_ID_THEORA || - p_sys->i_codec_id == CODEC_ID_AAC ) + ( p_sys->i_codec_id == CODEC_ID_AAC && + !p_dec->fmt_in.b_packetized ) ) { msg_Warn( p_dec, "waiting for extra data for codec %s", p_sys->psz_namecodec ); _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
