Michael Niedermayer 5b602a140f 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>		2011-10-22 01:56:57 +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
bktr.c	Merge remote-tracking branch 'qatar/master'	2011-10-20 02:34:51 +02:00
dshow_common.c
dshow_enummediatypes.c
dshow_enumpins.c
dshow_filter.c
dshow_pin.c
dshow.c	AVOptions: rename remaining FF_OPT_TYPE_* to AV_OPT_TYPE_*.	2011-10-17 07:33:10 +02:00
dshow.h
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	pulse: cosmetics	2011-10-19 16:16:21 -07: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