Michael Niedermayer 0104570fb6 Merge commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7' ... * commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7': silly typo fixes Conflicts: doc/protocols.texi libavcodec/aacpsy.c libavformat/utils.c tools/patcheck Merged-by: Michael Niedermayer <michaelni@gmx.at>		2013-05-04 10:17:52 +02:00
..
alldevices.c	Merge commit 'a0b7e289075dccf223b7f407790d8a86fc5d77e8'	2013-01-04 13:01:54 +01:00
alsa-audio-common.c	lavd/alsa: simplify reordering functions definition.	2013-02-02 14:13:11 +01:00
alsa-audio-dec.c	avformat/avdevice: add missing time.h includes	2013-03-12 15:28:22 +01:00
alsa-audio-enc.c	avformat/avdevice: add missing time.h includes	2013-03-12 15:28:22 +01:00
alsa-audio.h
avdevice.c
avdevice.h
bktr.c	bktr: Add missing includes for av_gettime()	2013-03-23 23:36:58 +02:00
caca.c
dshow_capture.h
dshow_common.c
dshow_enummediatypes.c
dshow_enumpins.c
dshow_filter.c
dshow_pin.c	dshow_pin: dont return a value from a void function	2013-03-25 22:12:07 +01:00
dshow.c	lavd/dshow: fix style and typo recently introduced.	2013-03-19 21:26:24 +01:00
dv1394.c
dv1394.h
fbdev.c
iec61883.c
jack_audio.c
lavfi.c	avdevice/lavfi: add error checking for av_opt_set_int_list()	2013-04-12 20:39:07 +02:00
libavdevice.v
libcdio.c	libcdio: support recent cdio-paranoia	2013-01-17 21:41:18 +01:00
libdc1394.c
Makefile
openal-dec.c	avformat/avdevice: add missing time.h includes	2013-03-12 15:28:22 +01:00
oss_audio.c
pulse.c
sdl.c	libavdevice sdl: added window_fullscreen option to switch SDL output into fullscreen mode	2013-03-18 20:44:21 +01:00
sndio_common.c
sndio_common.h
sndio_dec.c	sndio_dec: Add missing includes for av_gettime()	2013-03-24 13:20:53 +02:00
sndio_enc.c
timefilter.c
timefilter.h
v4l2.c	Merge commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7'	2013-05-04 10:17:52 +02:00
v4l.c
version.h	avdevice: bump major	2013-03-14 13:53:41 +01:00
vfwcap.c
x11grab.c