Michael Niedermayer 83d4a8442c Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  cosmetics: Prettyprint codec/format/filter registration files

Conflicts:
	libavcodec/allcodecs.c
	libavdevice/alldevices.c
	libavfilter/allfilters.c
	libavformat/allformats.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2012-12-29 14:27:38 +01:00

..

alldevices.c

Merge remote-tracking branch 'qatar/master'

2012-12-29 14:27:38 +01:00

alsa-audio-common.c

Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'

2012-11-12 11:32:11 +01:00

alsa-audio-dec.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

2012-09-05 14:33:32 +02:00

alsa-audio-enc.c

…

alsa-audio.h

Merge remote-tracking branch 'qatar/master'

2012-10-06 13:45:08 +02:00

avdevice.c

Merge remote-tracking branch 'qatar/master'

2012-08-16 16:20:30 +02:00

avdevice.h

…

bktr.c

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02:00

caca.c

caca: fix 10l typo

2012-10-12 19:05:58 +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

dshow.c

dshow: call CoUninitialize() on dshow_read_close()

2012-12-17 03:44:51 -02:00

dv1394.c

dv1394: Swap the min and max values of the 'standard' option

2012-11-02 11:25:48 +02:00

dv1394.h

miscellaneous typo fixes

2012-12-21 00:18:34 +01:00

fbdev.c

Merge remote-tracking branch 'qatar/master'

2012-10-12 17:21:01 +02:00

iec61883.c

Update iec61883 to handle multiple devices, and allow

2012-11-13 19:44:21 +01:00

jack_audio.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

2012-09-05 14:33:32 +02:00

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

Makefile

…

openal-dec.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

2012-09-05 14:33:32 +02:00

oss_audio.c

oss: warn when non block mode cannot be enabled.

2012-11-05 00:28:21 +01:00

pulse.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

2012-09-05 14:33:32 +02:00

sdl.c

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02:00

sndio_common.c

…

sndio_common.h

Merge remote-tracking branch 'qatar/master'

2012-10-06 13:45:08 +02:00

sndio_dec.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

2012-09-05 14:33:32 +02:00

sndio_enc.c

…

timefilter.c

Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'

2012-12-05 13:34:45 +01:00

timefilter.h

…

v4l2.c

Support H264 over video4linux2.

2012-12-21 18:12:29 +01:00

v4l.c

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02: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

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02:00

x11grab.c

x11grab: fix mixed declaration and code

2012-10-29 22:24:10 +01:00