ffmpeg/libavdevice
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
..
Makefile Merge remote-tracking branch 'luzero/pulse' 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
alsa-audio-dec.c
alsa-audio-enc.c
alsa-audio.h
avdevice.c
avdevice.h
bktr.c
dshow.c
dshow.h
dshow_common.c
dshow_enummediatypes.c
dshow_enumpins.c
dshow_filter.c
dshow_pin.c
dv1394.c
dv1394.h
fbdev.c
jack_audio.c
lavfi.c
libavdevice.v
libcdio.c
libdc1394.c
openal-dec.c
oss_audio.c
pulse.c Merge remote-tracking branch 'luzero/pulse' 2011-10-27 19:46:53 +02:00
sdl.c
sndio_common.c
sndio_common.h
sndio_dec.c
sndio_enc.c
timefilter.c
timefilter.h
v4l.c
v4l2.c
vfwcap.c
x11grab.c