Merge commit 'a7d45e06e9757f49ea4e105cbefc3462a7324e9a'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 17:21:29 +0000 (19:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 17:22:00 +0000 (19:22 +0200)
* commit 'a7d45e06e9757f49ea4e105cbefc3462a7324e9a':
  configure: The W64 demuxer should select the WAV demuxer, not depend on it

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure

diff --cc configure
+++ b/configure
@@@ -2074,9 -1836,7 +2074,9 @@@ spdif_muxer_select="aac_parser
  tak_demuxer_select="tak_parser"
  tg2_muxer_select="mov_muxer"
  tgp_muxer_select="mov_muxer"
- w64_demuxer_deps="wav_demuxer"
- w64_muxer_deps="wav_muxer"
 +vobsub_demuxer_select="mpegps_demuxer"
+ w64_demuxer_select="wav_demuxer"
++w64_muxer_select="wav_muxer"
  wav_demuxer_select="riffdec"
  wav_muxer_select="riffenc"
  webm_muxer_select="riffenc"