diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-22 01:56:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-22 01:56:57 +0200 |
| commit | 5b602a140f3c071b67572ce5af2eb0469c5c8bed (patch) | |
| tree | 2a47d6f024cb6960012d958745c753eae45466ed /configure | |
| parent | d000c5ae7e375ddf45215c550e9b2b815d3677af (diff) | |
| parent | 796cd225dabd3b53340b7c6defc5e5e654de23d7 (diff) | |
| download | ffmpeg-streaming-5b602a140f3c071b67572ce5af2eb0469c5c8bed.zip ffmpeg-streaming-5b602a140f3c071b67572ce5af2eb0469c5c8bed.tar.gz | |
Merge remote-tracking branch 'luzero/pulse'
* luzero/pulse:
pulse: cosmetics
pulse: introduce pulseaudio input
Conflicts:
Changelog
configure
libavdevice/Makefile
libavdevice/alldevices.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -1014,6 +1014,7 @@ CONFIG_LIST=" libopencore_amrwb libopencv libopenjpeg + libpulse librtmp libschroedinger libspeex @@ -1565,6 +1566,7 @@ libdc1394_indev_deps="libdc1394" 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" sdl_outdev_deps="sdl" sndio_indev_deps="sndio_h" sndio_outdev_deps="sndio_h" @@ -3029,6 +3031,7 @@ enabled libopencore_amrnb && require libopencore_amrnb opencore-amrnb/interf_de enabled libopencore_amrwb && require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb enabled libopencv && require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader enabled libopenjpeg && require libopenjpeg openjpeg.h opj_version -lopenjpeg +enabled libpulse && require_pkg_config libpulse-simple pulse/simple.h pa_simple_new enabled librtmp && require_pkg_config librtmp librtmp/rtmp.h RTMP_Socket enabled libschroedinger && require_pkg_config schroedinger-1.0 schroedinger/schro.h schro_init enabled libspeex && require libspeex speex/speex.h speex_decoder_init -lspeex @@ -3358,6 +3361,7 @@ echo "libopencore-amrnb support ${libopencore_amrnb-no}" echo "libopencore-amrwb support ${libopencore_amrwb-no}" echo "libopencv support ${libopencv-no}" echo "libopenjpeg enabled ${libopenjpeg-no}" +echo "libpulse enabled ${libpulse-no}" echo "librtmp enabled ${librtmp-no}" echo "libschroedinger enabled ${libschroedinger-no}" echo "libspeex enabled ${libspeex-no}" |
