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>
11 years ago · 05f1b4e2ec
parent 1faece7ecc a7d45e06e9
commit 05f1b4e2ec
1 changed files with 2 additions and 2 deletions
--- a/4
+++ b/4
@ -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_demuxer_select="wav_demuxer"
-w64_muxer_deps="wav_muxer"
+w64_muxer_select="wav_muxer"
 wav_demuxer_select="riffdec"
 wav_muxer_select="riffenc"
 webm_muxer_select="riffenc"