diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-28 01:50:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-28 01:50:36 +0200 |
| commit | 25d8099beb4c7eb93539f9162af1336ef7130fed (patch) | |
| tree | 4f668222da738409baf5ad8a1ee9d1c9f9004f96 /configure | |
| parent | 57e2ded4234356c26bf92b0a627ec383ea8d288f (diff) | |
| parent | 991f3de1bb696a55f7604e4b7d53492299fe44b5 (diff) | |
| download | ffmpeg-25d8099beb4c7eb93539f9162af1336ef7130fed.tar.gz | |
Merge remote-tracking branch 'newdev/master'
* newdev/master:
ac3enc: Add codec-specific options for writing AC-3 metadata.
NOT MERGED: Remove arrozcru URL from documentation
sndio support for playback and record
Conflicts:
doc/faq.texi
doc/general.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -1098,6 +1098,7 @@ HAVE_LIST=" sdl sdl_video_size setmode + sndio_h socklen_t soundcard_h poll_h @@ -1448,6 +1449,8 @@ jack_indev_deps="jack_jack_h" libdc1394_indev_deps="libdc1394" oss_indev_deps_any="soundcard_h sys_soundcard_h" oss_outdev_deps_any="soundcard_h sys_soundcard_h" +sndio_indev_deps="sndio_h" +sndio_outdev_deps="sndio_h" v4l_indev_deps="linux_videodev_h" v4l2_indev_deps_any="linux_videodev2_h sys_videoio_h" vfwcap_indev_deps="capCreateCaptureWindow vfwcap_defines" @@ -2934,6 +2937,7 @@ check_cpp_condition vfw.h "WM_CAP_DRIVER_CONNECT > WM_USER" && enable vfwcap_def check_header dev/video/bktr/ioctl_bt848.h; } || check_header dev/ic/bt8xx.h +check_header sndio.h check_header sys/soundcard.h check_header soundcard.h @@ -2941,6 +2945,8 @@ enabled_any alsa_indev alsa_outdev && check_lib2 alsa/asoundlib.h snd_pcm_htimes enabled jack_indev && check_lib2 jack/jack.h jack_client_open -ljack +enabled_any sndio_indev sndio_outdev && check_lib2 sndio.h sio_open -lsndio + enabled x11grab && check_header X11/Xlib.h && check_header X11/extensions/XShm.h && |