ffmpeg/libavdevice
Michael Niedermayer a1b5cf0181 Merge commit '85b3b1c4ba7af9c2658442b0aafd27d613e1854b'
* commit '85b3b1c4ba7af9c2658442b0aafd27d613e1854b':
  xcbgrab: Unbreak parsing filename options

Conflicts:
	libavdevice/xcbgrab.c

See: db442c8736
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-25 01:44:49 +01:00
..
Makefile
alldevices.c
alsa-audio-common.c
alsa-audio-dec.c
alsa-audio-enc.c
alsa-audio.h
avdevice.c
avdevice.h
avdeviceres.rc
avfoundation.m
bktr.c Merge commit '81ef46020fa654720e3beb4f5551ba634fae262a' 2015-02-16 02:56:17 +01:00
caca.c
decklink_common.cpp avdevice/decklink_common: Use defined(__APPLE__) instead of __APPLE__ 2015-02-08 04:52:52 +01:00
decklink_common.h
decklink_common_c.h avdevice/decklink: 10 Bit support for Decklink input device 2015-02-08 04:31:27 +01:00
decklink_dec.cpp avdevice/decklink: 10 Bit support for Decklink input device 2015-02-08 04:31:27 +01:00
decklink_dec.h
decklink_dec_c.c avdevice/decklink: 10 Bit support for Decklink input device 2015-02-08 04:31:27 +01:00
decklink_enc.cpp
decklink_enc.h
decklink_enc_c.c
dshow.c
dshow_capture.h
dshow_common.c
dshow_crossbar.c
dshow_enummediatypes.c
dshow_enumpins.c
dshow_filter.c
dshow_pin.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_audio.c
lavfi.c
libavdevice.v
libcdio.c
libdc1394.c
openal-dec.c
opengl_enc.c
opengl_enc_shaders.h
oss_audio.c
oss_audio.h
oss_audio_dec.c
oss_audio_enc.c
pulse_audio_common.c
pulse_audio_common.h
pulse_audio_dec.c
pulse_audio_enc.c
qtkit.m
sdl.c
sndio_common.c
sndio_common.h
sndio_dec.c
sndio_enc.c
timefilter.c
timefilter.h
utils.c
v4l.c
v4l2-common.c
v4l2-common.h
v4l2.c
v4l2enc.c
version.h
vfwcap.c
x11grab.c Merge commit 'b31328d008985f87f0a7c83c700847cef1a4f08c' 2015-02-25 01:12:50 +01:00
xcbgrab.c Merge commit '85b3b1c4ba7af9c2658442b0aafd27d613e1854b' 2015-02-25 01:44:49 +01:00
xv.c