Merge commit '6fb65973c9501d3fe94a5a9195c01cd20083066e'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 17:33:46 +0000 (19:33 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 17:33:46 +0000 (19:33 +0200)
* commit '6fb65973c9501d3fe94a5a9195c01cd20083066e':
  configure: Properly split dv1394 indev dependencies

Conflicts:
configure

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

diff --cc configure
+++ b/configure
@@@ -2090,18 -1851,12 +2090,19 @@@ xwma_demuxer_select="riffdec
  alsa_indev_deps="alsa_asoundlib_h snd_pcm_htimestamp"
  alsa_outdev_deps="alsa_asoundlib_h"
  bktr_indev_deps_any="dev_bktr_ioctl_bt848_h machine_ioctl_bt848_h dev_video_bktr_ioctl_bt848_h dev_ic_bt8xx_h"
- dv1394_indev_deps="dv1394 dv_demuxer"
 +caca_outdev_deps="libcaca"
 +dshow_indev_deps="IBaseFilter"
 +dshow_indev_extralibs="-lpsapi -lole32 -lstrmiids -luuid"
+ dv1394_indev_deps="dv1394"
+ dv1394_indev_select="dv_demuxer"
  fbdev_indev_deps="linux_fb_h"
 -jack_indev_deps="jack_jack_h pthreads"
 +iec61883_indev_deps="libiec61883"
 +jack_indev_deps="jack_jack_h sem_timedwait"
 +lavfi_indev_deps="avfilter"
  libcdio_indev_deps="libcdio"
  libdc1394_indev_deps="libdc1394"
 +libv4l2_indev_deps="libv4l2"
 +openal_indev_deps="openal"
  oss_indev_deps_any="soundcard_h sys_soundcard_h"
  oss_outdev_deps_any="soundcard_h sys_soundcard_h"
  pulse_indev_deps="libpulse"