diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 18:30:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 18:30:47 +0200 |
| commit | 0a8f5eb23a2d95f2bab6a0e7e19cc838d99fcdf1 (patch) | |
| tree | 5602f50fe193e3307a6ae8320fc478533ebe3a06 /configure | |
| parent | 508a5349da9869382803445f8e380751ec43021e (diff) | |
| parent | 255d9c570e117f0fcb8e51fa2c5996f3c4b2052b (diff) | |
Merge commit '255d9c570e117f0fcb8e51fa2c5996f3c4b2052b'
* commit '255d9c570e117f0fcb8e51fa2c5996f3c4b2052b':
riff: Move demuxing code to a separate file.
Conflicts:
configure
libavformat/riff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 13 |
1 files changed, 13 insertions, 0 deletions
@@ -1574,6 +1574,7 @@ CONFIG_EXTRA=" mpegvideoenc nettle rangecoder + riffdec riffenc rtpdec rtpenc_chain @@ -2025,13 +2026,18 @@ libutvideo_encoder_deps="libutvideo" # demuxers / muxers ac3_demuxer_select="ac3_parser" +asf_demuxer_select="riffdec" asf_muxer_select="riffenc" asf_stream_muxer_select="asf_muxer" +avi_demuxer_select="riffdec" avi_muxer_select="riffenc" avisynth_demuxer_deps="avisynth" +avisynth_demuxer_select="riffdec" +caf_demuxer_select="riffdec" dirac_demuxer_select="dirac_parser" dts_demuxer_select="dca_parser" dtshd_demuxer_select="dca_parser" +dxa_demuxer_select="riffdec" eac3_demuxer_select="ac3_parser" f4v_muxer_select="mov_muxer" flac_demuxer_select="flac_parser" @@ -2040,9 +2046,11 @@ 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_suggest="bzlib lzo zlib" matroska_muxer_select="riffenc" mmf_muxer_select="riffenc" +mov_demuxer_select="riffdec" mov_demuxer_suggest="zlib" mov_muxer_select="riffenc rtpenc_chain" mp3_demuxer_select="mpegaudio_parser" @@ -2051,6 +2059,7 @@ mpegts_muxer_select="adts_muxer latm_muxer" mpegtsraw_demuxer_select="mpegts_demuxer" mxf_d10_muxer_select="mxf_muxer" nut_muxer_select="riffenc" +nuv_demuxer_select="riffdec" ogg_demuxer_select="golomb" psp_muxer_select="mov_muxer" rtp_demuxer_select="sdp_demuxer" @@ -2068,8 +2077,12 @@ tgp_muxer_select="mov_muxer" vobsub_demuxer_select="mpegps_demuxer" w64_demuxer_deps="wav_demuxer" w64_muxer_deps="wav_muxer" +wav_demuxer_select="riffdec" wav_muxer_select="riffenc" webm_muxer_select="riffenc" +wtv_demuxer_select="riffdec" +xmv_demuxer_select="riffdec" +xwma_demuxer_select="riffdec" # indevs / outdevs alsa_indev_deps="alsa_asoundlib_h snd_pcm_htimestamp" |