Michael Niedermayer d4a6c94046 Merge commit '4f373a5111f900af54301907132942f95276285c' ... * commit '4f373a5111f900af54301907132942f95276285c': vfwcap: Unbreak building after c201069fa Conflicts: libavdevice/vfwcap.c See: 4d0f6d3fb4 Merged-by: Michael Niedermayer <michaelni@gmx.at>		2015-04-11 02:19:32 +02:00
..
alldevices.c
alsa_dec.c	Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc'	2015-04-09 21:36:42 +02:00
alsa_enc.c	Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc'	2015-04-09 21:36:42 +02:00
alsa.c	Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc'	2015-04-09 21:36:42 +02:00
alsa.h	Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc'	2015-04-09 21:36:42 +02:00
avdevice.c
avdevice.h
avdeviceres.rc
avfoundation.m	avdevice/avfoundation: Fix occured typo	2015-03-30 21:41:17 +02:00
bktr.c
caca.c
decklink_common_c.h
decklink_common.cpp
decklink_common.h
decklink_dec_c.c
decklink_dec.cpp
decklink_dec.h
decklink_enc_c.c
decklink_enc.cpp
decklink_enc.h
dshow_capture.h
dshow_common.c
dshow_crossbar.c
dshow_enummediatypes.c
dshow_enumpins.c
dshow_filter.c
dshow_pin.c
dshow.c
dv1394.c
dv1394.h
fbdev_common.c
fbdev_common.h
fbdev_dec.c
fbdev_enc.c
file_open.c
gdigrab.c
iec61883.c
internal.h
jack.c	Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc'	2015-04-09 21:36:42 +02:00
lavfi.c
libavdevice.v
libcdio.c
libdc1394.c	Merge commit 'c201069fac9a76e6604f9d84d76a172434d62200'	2015-04-09 21:07:24 +02:00
Makefile	Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc'	2015-04-09 21:36:42 +02:00
openal-dec.c
opengl_enc_shaders.h
opengl_enc.c
oss_dec.c	Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc'	2015-04-09 21:36:42 +02:00
oss_enc.c	Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc'	2015-04-09 21:36:42 +02:00
oss.c	Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc'	2015-04-09 21:36:42 +02:00
oss.h	Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc'	2015-04-09 21:36:42 +02:00
pulse_audio_common.c
pulse_audio_common.h
pulse_audio_dec.c	Merge commit 'c201069fac9a76e6604f9d84d76a172434d62200'	2015-04-09 21:07:24 +02:00
pulse_audio_enc.c
qtkit.m	lavd/qtkit: Silence deprecation warnings when using clang.	2015-03-10 12:11:15 +01:00
sdl.c
sndio_dec.c	Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc'	2015-04-09 21:36:42 +02:00
sndio_enc.c	Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc'	2015-04-09 21:36:42 +02:00
sndio.c	Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc'	2015-04-09 21:36:42 +02:00
sndio.h	Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc'	2015-04-09 21:36:42 +02:00
timefilter.c
timefilter.h
utils.c
v4l2-common.c
v4l2-common.h
v4l2.c	fix spelling errors	2015-03-06 21:35:00 +01:00
v4l2enc.c
v4l.c
version.h
vfwcap.c	Merge commit '4f373a5111f900af54301907132942f95276285c'	2015-04-11 02:19:32 +02:00
x11grab.c	Merge commit 'c201069fac9a76e6604f9d84d76a172434d62200'	2015-04-09 21:07:24 +02:00
xcbgrab.c	Merge commit 'c201069fac9a76e6604f9d84d76a172434d62200'	2015-04-09 21:07:24 +02:00
xv.c