Michael Niedermayer 53c2f401f7 Merge commit '246da0b13551b1f80f067e4f258e5bd691f5ab33' ... * commit '246da0b13551b1f80f067e4f258e5bd691f5ab33': v4l2: avoid pointless indirection. vdpau: Add VC-1 decoding via hwaccel infrastructure vdpau: Add H.264 decoding via hwaccel infrastructure Conflicts: configure libavcodec/Makefile libavcodec/version.h libavdevice/v4l2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2013-01-14 14:00:21 +01:00
..
alldevices.c	Merge commit 'a0b7e289075dccf223b7f407790d8a86fc5d77e8'	2013-01-04 13:01:54 +01:00
alsa-audio-common.c
alsa-audio-dec.c
alsa-audio-enc.c
alsa-audio.h
avdevice.c
avdevice.h
bktr.c	bktr: fix warning: missing braces around initializer	2012-12-29 19:27:07 +01:00
caca.c
dshow_capture.h	dshow: handle events in graph	2012-12-17 03:44:12 -02:00
dshow_common.c
dshow_enummediatypes.c
dshow_enumpins.c
dshow_filter.c
dshow_pin.c
dshow.c	dshow: call CoUninitialize() on dshow_read_close()	2012-12-17 03:44:51 -02:00
dv1394.c
dv1394.h	miscellaneous typo fixes	2012-12-21 00:18:34 +01:00
fbdev.c
iec61883.c
jack_audio.c
lavfi.c
libavdevice.v
libcdio.c
libdc1394.c
Makefile
openal-dec.c
oss_audio.c
pulse.c
sdl.c
sndio_common.c
sndio_common.h
sndio_dec.c
sndio_enc.c
timefilter.c
timefilter.h
v4l2.c	Merge commit '246da0b13551b1f80f067e4f258e5bd691f5ab33'	2013-01-14 14:00:21 +01:00
v4l.c
version.h
vfwcap.c
x11grab.c