Michael Niedermayer c2553a5585 Merge remote-tracking branch 'luzero/pulse' ... * luzero/pulse: pulse: set the device from the avformat filename Conflicts: libavdevice/pulse.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2011-10-27 19:46:53 +02:00
..
alldevices.c	Merge remote-tracking branch 'luzero/pulse'	2011-10-22 01:56:57 +02:00
alsa-audio-common.c	Merge remote-tracking branch 'qatar/master'	2011-09-21 21:25:43 +02:00
alsa-audio-dec.c	Merge remote-tracking branch 'qatar/master'	2011-10-20 02:34:51 +02:00
alsa-audio-enc.c	Merge remote-tracking branch 'qatar/master'	2011-09-24 22:39:52 +02:00
alsa-audio.h	Merge remote-tracking branch 'qatar/master'	2011-10-22 01:16:41 +02:00
avdevice.c
avdevice.h	Merge remote-tracking branch 'qatar/master'	2011-09-17 22:36:43 +02:00
bktr.c	Merge remote-tracking branch 'qatar/master'	2011-10-20 02:34:51 +02:00
dshow_common.c	dshow: add audio/video options	2011-09-16 11:06:56 +02:00
dshow_enummediatypes.c
dshow_enumpins.c	dshow: cleanup internal references on capture interface	2011-09-16 11:16:05 +02:00
dshow_filter.c	dshow: cleanup internal references on capture interface	2011-09-16 11:16:05 +02:00
dshow_pin.c	dshow: release pin on disconnect	2011-09-16 11:16:05 +02:00
dshow.c	AVOptions: rename remaining FF_OPT_TYPE_* to AV_OPT_TYPE_*.	2011-10-17 07:33:10 +02:00
dshow.h	dshow: add audio/video options	2011-09-16 11:06:56 +02:00
dv1394.c	Merge remote-tracking branch 'qatar/master'	2011-10-21 02:01:26 +02:00
dv1394.h
fbdev.c	Merge remote-tracking branch 'qatar/master'	2011-10-20 02:34:51 +02:00
jack_audio.c	Merge remote-tracking branch 'qatar/master'	2011-10-22 01:16:41 +02:00
lavfi.c	AVOptions: rename remaining FF_OPT_TYPE_* to AV_OPT_TYPE_*.	2011-10-17 07:33:10 +02:00
libavdevice.v
libcdio.c	Merge remote-tracking branch 'qatar/master'	2011-10-21 02:01:26 +02:00
libdc1394.c	Merge remote-tracking branch 'qatar/master'	2011-10-20 02:34:51 +02:00
Makefile	Merge remote-tracking branch 'luzero/pulse'	2011-10-22 01:56:57 +02:00
openal-dec.c	AVOptions: rename remaining FF_OPT_TYPE_* to AV_OPT_TYPE_*.	2011-10-17 07:33:10 +02:00
oss_audio.c	Merge remote-tracking branch 'qatar/master'	2011-10-20 02:34:51 +02:00
pulse.c	Merge remote-tracking branch 'luzero/pulse'	2011-10-27 19:46:53 +02:00
sdl.c	AVOptions: rename remaining FF_OPT_TYPE_* to AV_OPT_TYPE_*.	2011-10-17 07:33:10 +02:00
sndio_common.c
sndio_common.h
sndio_dec.c	Merge remote-tracking branch 'qatar/master'	2011-10-20 02:34:51 +02:00
sndio_enc.c
timefilter.c	Merge remote-tracking branch 'qatar/master'	2011-10-22 01:16:41 +02:00
timefilter.h	Merge remote-tracking branch 'qatar/master'	2011-10-22 01:16:41 +02:00
v4l2.c	Merge remote-tracking branch 'qatar/master'	2011-10-20 02:34:51 +02:00
v4l.c	Merge remote-tracking branch 'qatar/master'	2011-10-20 02:34:51 +02:00
vfwcap.c	Merge remote-tracking branch 'qatar/master'	2011-10-20 02:34:51 +02:00
x11grab.c	Merge remote-tracking branch 'qatar/master'	2011-10-20 02:34:51 +02:00