Michael Niedermayer 0fecf2642b Merge remote-tracking branch 'newdev/master' ...

Conflicts:
	Changelog
	doc/APIchanges
	doc/optimization.txt
	libavformat/avio.h

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

2011-03-17 17:22:52 +01:00

..

alldevices.c

framebuffer device demuxer

2011-03-08 17:33:23 +01:00

alsa-audio-common.c

Remove explicit filename from Doxygen @file commands.

2010-04-20 14:45:34 +00:00

alsa-audio-dec.c

Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.

2011-01-28 03:15:34 +01:00

alsa-audio-enc.c

Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.

2011-01-28 03:15:34 +01:00

alsa-audio.h

Define macro AV_NE() and use it in libavdevice.

2010-08-17 18:25:34 +00:00

avdevice.c

use LIBAV_LICENSE and LIBAV_VERSION instead of FFMPEG_*

2011-03-16 21:54:39 +01:00

avdevice.h

framebuffer device demuxer

2011-03-08 17:33:23 +01:00

bktr.c

Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.

2011-01-28 03:15:34 +01:00

dv1394.c

Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.

2011-01-28 03:15:34 +01:00

dv1394.h

Remove file name from file headers.

2009-02-09 11:17:54 +00:00

fbdev.c

fbdev: fix check on nanosleep return vale

2011-03-13 01:41:46 +01:00

jack_audio.c

Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.

2011-01-28 03:15:34 +01:00

libavdevice.v

Add symbol versioning for shared libraries

2010-01-16 04:49:02 +00:00

libdc1394.c

Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.

2011-01-28 03:15:34 +01:00

Makefile

framebuffer device demuxer

2011-03-08 17:33:23 +01:00

oss_audio.c

Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.

2011-01-28 03:15:34 +01:00

v4l2.c

Merge libavcore into libavutil

2011-02-16 23:00:30 +01:00

v4l.c

Merge libavcore into libavutil

2011-02-16 23:00:30 +01:00

vfwcap.c

Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.

2011-01-28 03:15:34 +01:00

x11grab.c

Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.

2011-01-28 03:15:34 +01:00