mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-02 22:43:22 +02:00
Merge commit '6fb65973c9501d3fe94a5a9195c01cd20083066e'
* commit '6fb65973c9501d3fe94a5a9195c01cd20083066e': configure: Properly split dv1394 indev dependencies Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
66328da700
3
configure
vendored
3
configure
vendored
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user