diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 19:21:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 19:22:00 +0200 |
| commit | 05f1b4e2ecc4683467669a190e3a53df413de805 (patch) | |
| tree | e1c36318eec9815f5329611b2dbb5f906a7e0ea8 /configure | |
| parent | 1faece7eccdb35df1cdd5363c4bbc67f6a668755 (diff) | |
| parent | a7d45e06e9757f49ea4e105cbefc3462a7324e9a (diff) | |
Merge commit 'a7d45e06e9757f49ea4e105cbefc3462a7324e9a'
* commit 'a7d45e06e9757f49ea4e105cbefc3462a7324e9a':
configure: The W64 demuxer should select the WAV demuxer, not depend on it
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -2075,8 +2075,8 @@ tak_demuxer_select="tak_parser" tg2_muxer_select="mov_muxer" tgp_muxer_select="mov_muxer" vobsub_demuxer_select="mpegps_demuxer" -w64_demuxer_deps="wav_demuxer" -w64_muxer_deps="wav_muxer" +w64_demuxer_select="wav_demuxer" +w64_muxer_select="wav_muxer" wav_demuxer_select="riffdec" wav_muxer_select="riffenc" webm_muxer_select="riffenc" |