diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-03 02:56:52 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-03 02:56:52 +0200 |
commit | f67309cabe27af33dcfcfb61fe1df39af9b5ab46 (patch) | |
tree | 31bf4f48fbbbbdb145f8163f0295266c86ca173d /configure | |
parent | a128b310efa31ea0f2a3898cd58c0d954c8605be (diff) | |
parent | 2439bd86817374362ac8daa701fdb567e14cbe50 (diff) | |
download | ffmpeg-streaming-f67309cabe27af33dcfcfb61fe1df39af9b5ab46.zip ffmpeg-streaming-f67309cabe27af33dcfcfb61fe1df39af9b5ab46.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpegtsenc: Support LATM packetization for AAC
adtsenc: Don't expose the muxer internals to the rest of lavf
mpegtsenc: use AVFormatContext for AAC packetization
mpegtsenc: use AVERROR() for return codes
Conflicts:
libavformat/adts.h
libavformat/mpegtsenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -1614,6 +1614,7 @@ matroska_demuxer_suggest="zlib bzlib" mov_demuxer_suggest="zlib" mp3_demuxer_select="mpegaudio_parser" mp4_muxer_select="mov_muxer" +mpegts_muxer_select="adts_muxer latm_muxer" mpegtsraw_demuxer_select="mpegts_demuxer" mxf_d10_muxer_select="mxf_muxer" ogg_demuxer_select="golomb" |