ffmpeg | branch: master | James Almer <[email protected]> | Sun Apr 9 14:41:43 2017 -0300| [fa1fe495fc82062411e62cc530dfbc760d8271d2] | committer: James Almer
Merge commit '29d2e03ed96d9f7b8cb2cc87dca0a63c2a6eff70' * commit '29d2e03ed96d9f7b8cb2cc87dca0a63c2a6eff70': configure: Simplify and fix avfoundation indev handling Merged-by: James Almer <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fa1fe495fc82062411e62cc530dfbc760d8271d2 --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 4e80bf9350..8eb94188b4 100755 --- a/configure +++ b/configure @@ -2986,8 +2986,8 @@ xwma_demuxer_select="riffdec" # indevs / outdevs alsa_indev_deps="alsa_asoundlib_h snd_pcm_htimestamp" alsa_outdev_deps="alsa_asoundlib_h" -avfoundation_indev_extralibs="-framework CoreVideo -framework Foundation -framework AVFoundation -framework CoreMedia" -avfoundation_indev_select="avfoundation" +avfoundation_indev_deps="pthreads" +avfoundation_indev_extralibs="-framework Foundation -framework AVFoundation -framework CoreVideo -framework CoreMedia" bktr_indev_deps_any="dev_bktr_ioctl_bt848_h machine_ioctl_bt848_h dev_video_bktr_ioctl_bt848_h dev_ic_bt8xx_h" caca_outdev_deps="libcaca" decklink_indev_deps="decklink pthreads" ====================================================================== diff --cc configure index 4e80bf9350,fae5be0b95..8eb94188b4 --- a/configure +++ b/configure @@@ -2986,16 -2362,9 +2986,16 @@@ xwma_demuxer_select="riffdec # indevs / outdevs alsa_indev_deps="alsa_asoundlib_h snd_pcm_htimestamp" alsa_outdev_deps="alsa_asoundlib_h" - avfoundation_indev_extralibs="-framework CoreVideo -framework Foundation -framework AVFoundation -framework CoreMedia" - avfoundation_indev_select="avfoundation" -avfoundation_indev_deps="AVFoundation_AVFoundation_h objc_arc pthreads" ++avfoundation_indev_deps="pthreads" + avfoundation_indev_extralibs="-framework Foundation -framework AVFoundation -framework CoreVideo -framework CoreMedia" bktr_indev_deps_any="dev_bktr_ioctl_bt848_h machine_ioctl_bt848_h dev_video_bktr_ioctl_bt848_h dev_ic_bt8xx_h" +caca_outdev_deps="libcaca" +decklink_indev_deps="decklink pthreads" +decklink_indev_extralibs="-lstdc++" +decklink_outdev_deps="decklink pthreads" +decklink_outdev_extralibs="-lstdc++" +dshow_indev_deps="IBaseFilter" +dshow_indev_extralibs="-lpsapi -lole32 -lstrmiids -luuid -loleaut32 -lshlwapi" dv1394_indev_deps="dv1394" dv1394_indev_select="dv_demuxer" fbdev_indev_deps="linux_fb_h" _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
