ffmpeg/libavdevice
Michael Niedermayer e1cf1a9c89 Merge commit 'a0b7e289075dccf223b7f407790d8a86fc5d77e8'
* commit 'a0b7e289075dccf223b7f407790d8a86fc5d77e8':
  aviobuf: Partial support for reading in read/write contexts
  build: Avoid detecting bogus components named 'x'

Conflicts:
	libavcodec/allcodecs.c
	libavdevice/alldevices.c
	libavformat/allformats.c
	libavformat/aviobuf.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-04 13:01:54 +01:00
..
Makefile
alldevices.c Merge commit 'a0b7e289075dccf223b7f407790d8a86fc5d77e8' 2013-01-04 13:01:54 +01:00
alsa-audio-common.c Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88' 2012-11-12 11:32:11 +01:00
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.c dshow: call CoUninitialize() on dshow_read_close() 2012-12-17 03:44:51 -02:00
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: Use NO_DSHOW_STRSAFE for all dshow header inclusions 2012-11-16 19:26:13 +01:00
dshow_pin.c dshow: Use NO_DSHOW_STRSAFE for all dshow header inclusions 2012-11-16 19:26:13 +01:00
dv1394.c
dv1394.h miscellaneous typo fixes 2012-12-21 00:18:34 +01:00
fbdev.c
iec61883.c Update iec61883 to handle multiple devices, and allow 2012-11-13 19:44:21 +01:00
jack_audio.c
lavfi.c lavd/lavfi: fix float.h include. 2012-12-06 15:09:47 +01:00
libavdevice.v
libcdio.c Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967' 2012-12-05 13:34:45 +01:00
libdc1394.c Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967' 2012-12-05 13:34:45 +01:00
openal-dec.c
oss_audio.c
pulse.c
sdl.c
sndio_common.c
sndio_common.h
sndio_dec.c
sndio_enc.c
timefilter.c Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967' 2012-12-05 13:34:45 +01:00
timefilter.h
v4l.c
v4l2.c Support H264 over video4linux2. 2012-12-21 18:12:29 +01:00
version.h lavu/opt: allow to set sample and pixel format with av_opt_set_int() 2012-12-01 19:33:30 +01:00
vfwcap.c
x11grab.c