diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 19:33:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 19:33:46 +0200 |
| commit | 66328da700c73246e2d4c5254905f9e5b4e0fa31 (patch) | |
| tree | 7995096ae19997f784130738c2c5b87d2147793a | |
| parent | c32db6adab9942781cc5a23f62abb839a5595a83 (diff) | |
| parent | 6fb65973c9501d3fe94a5a9195c01cd20083066e (diff) | |
| download | ffmpeg-66328da700c73246e2d4c5254905f9e5b4e0fa31.tar.gz | |
Merge commit '6fb65973c9501d3fe94a5a9195c01cd20083066e'
* commit '6fb65973c9501d3fe94a5a9195c01cd20083066e':
configure: Properly split dv1394 indev dependencies
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -2093,7 +2093,8 @@ bktr_indev_deps_any="dev_bktr_ioctl_bt848_h machine_ioctl_bt848_h dev_video_bktr caca_outdev_deps="libcaca" dshow_indev_deps="IBaseFilter" dshow_indev_extralibs="-lpsapi -lole32 -lstrmiids -luuid" -dv1394_indev_deps="dv1394 dv_demuxer" +dv1394_indev_deps="dv1394" +dv1394_indev_select="dv_demuxer" fbdev_indev_deps="linux_fb_h" iec61883_indev_deps="libiec61883" jack_indev_deps="jack_jack_h sem_timedwait" |