diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-22 21:14:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-22 21:41:00 +0200 |
| commit | 300d489ac9bb11b67bde90521d43d12fe68be72e (patch) | |
| tree | ad9174165f29e2f86dba416bc58b2417d2aaf810 /configure | |
| parent | 3e07a056a8e67c8c8a1fdf4b1efd231aa9bcd0ad (diff) | |
| parent | 051aadeed104ecbe8ee4850ec2d7e5394f5e1ccd (diff) | |
| download | ffmpeg-300d489ac9bb11b67bde90521d43d12fe68be72e.tar.gz | |
Merge commit '051aadeed104ecbe8ee4850ec2d7e5394f5e1ccd'
* commit '051aadeed104ecbe8ee4850ec2d7e5394f5e1ccd':
ogg: Provide aliases for Speex, Opus and audio-only ogg
Conflicts:
Changelog
libavformat/oggenc.c
libavformat/version.h
See: 2ccc6ff03acc3ca31db1aeb828c747d05b5cb6aa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -2407,7 +2407,9 @@ mpegtsraw_demuxer_select="mpegts_demuxer" mxf_d10_muxer_select="mxf_muxer" nut_muxer_select="riffenc" nuv_demuxer_select="riffdec" +oga_muxer_select="ogg_muxer" ogg_demuxer_select="golomb" +opus_muxer_select="ogg_muxer" psp_muxer_select="mov_muxer" rtp_demuxer_select="sdp_demuxer" rtpdec_select="asf_demuxer rm_demuxer rtp_protocol mpegts_demuxer mov_demuxer" @@ -2418,6 +2420,7 @@ sap_muxer_select="rtp_muxer rtp_protocol rtpenc_chain" sdp_demuxer_select="rtpdec" smoothstreaming_muxer_select="ismv_muxer" spdif_muxer_select="aac_parser" +spx_muxer_select="ogg_muxer" tak_demuxer_select="tak_parser" tg2_muxer_select="mov_muxer" tgp_muxer_select="mov_muxer" |