diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-24 17:53:30 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-24 17:53:30 +0000 |
| commit | 745d0c0300852e902199f39d282dc60e64b8c208 (patch) | |
| tree | ec5869c71029dc7cd89c14e9f4dc6480bb19d39b /configure | |
| parent | 34e4c588c8e86fc407f8a67942434949f51b7da6 (diff) | |
| parent | 624e235502c5aa2d17e22dd6c0ccdf080a177310 (diff) | |
Merge commit '624e235502c5aa2d17e22dd6c0ccdf080a177310'
* commit '624e235502c5aa2d17e22dd6c0ccdf080a177310':
build: Introduce iso_media component
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 16 |
1 files changed, 9 insertions, 7 deletions
@@ -2009,6 +2009,7 @@ CONFIG_EXTRA=" iirfilter imdct15 intrax8 + iso_media ividsp jpegtables lgplv3 @@ -2672,11 +2673,11 @@ asf_demuxer_select="riffdec" asf_o_demuxer_select="riffdec" asf_muxer_select="riffenc" asf_stream_muxer_select="asf_muxer" -avi_demuxer_select="riffdec exif" +avi_demuxer_select="iso_media riffdec exif" avi_muxer_select="riffenc" avisynth_demuxer_deps="avisynth" avisynth_demuxer_select="riffdec" -caf_demuxer_select="riffdec" +caf_demuxer_select="iso_media riffdec" dash_muxer_select="mp4_muxer" dirac_demuxer_select="dirac_parser" dts_demuxer_select="dca_parser" @@ -2696,15 +2697,16 @@ ismv_muxer_select="mov_muxer" libnut_demuxer_deps="libnut" libnut_muxer_deps="libnut" matroska_audio_muxer_select="matroska_muxer" -matroska_demuxer_select="riffdec" +matroska_demuxer_select="iso_media riffdec" matroska_demuxer_suggest="bzlib lzo zlib" -matroska_muxer_select="riffenc" +matroska_muxer_select="iso_media riffenc" mmf_muxer_select="riffenc" -mov_demuxer_select="riffdec" +mov_demuxer_select="iso_media riffdec" mov_demuxer_suggest="zlib" -mov_muxer_select="riffenc rtpenc_chain" +mov_muxer_select="iso_media riffenc rtpenc_chain" mp3_demuxer_select="mpegaudio_parser" mp4_muxer_select="mov_muxer" +mpegts_demuxer_select="iso_media" mpegts_muxer_select="adts_muxer latm_muxer" mpegtsraw_demuxer_select="mpegts_demuxer" mxf_d10_muxer_select="mxf_muxer" @@ -2734,7 +2736,7 @@ w64_demuxer_select="wav_demuxer" w64_muxer_select="wav_muxer" wav_demuxer_select="riffdec" wav_muxer_select="riffenc" -webm_muxer_select="riffenc" +webm_muxer_select="iso_media riffenc" webm_dash_manifest_demuxer_select="matroska_demuxer" wtv_demuxer_select="mpegts_demuxer riffdec" wtv_muxer_select="mpegts_muxer riffenc" |