Michael Niedermayer 4ccb7911ba Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  ARM: silence some annoying armcc warnings
  ffplay: Remove unused-but-set channels variable from update_sample_display().
  build: Add DEP_LIBS dependency directly to the shared library build rule.
  build: Remove multiple inclusion guards from config.mak.
  build: Remove redundant config.mak includes from subdirectory Makefiles.
  aacenc: Mark psy_3gpp_window() as av_unused.

Conflicts:
	configure

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

2011-06-26 02:31:32 +02:00

..

alldevices.c

lavdev: add SDL output device

2011-05-28 19:17:14 +02:00

alsa-audio-common.c

Merge remote-tracking branch 'qatar/master'

2011-06-24 03:07:04 +02:00

alsa-audio-dec.c

lavdev: prefer the inclusion of avdevice.h over that of libavformat/avformat.h

2011-05-27 12:15:09 +02:00

alsa-audio-enc.c

ALSA: implement channel layout for playback.

2011-06-23 08:49:48 +02:00

alsa-audio.h

Merge remote-tracking branch 'qatar/master'

2011-06-24 03:07:04 +02:00

avdevice.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

avdevice.h

sdl: use the filename for defining the window title, if not specified

2011-06-05 13:17:38 +02:00

bktr.c

Merge remote-tracking branch 'qatar/master'

2011-06-24 03:07:04 +02:00

dshow_common.c

DirectShow capture support

2011-05-21 17:23:14 +02:00

dshow_enummediatypes.c

DirectShow capture support

2011-05-21 17:23:14 +02:00

dshow_enumpins.c

DirectShow capture support

2011-05-21 17:23:14 +02:00

dshow_filter.c

DirectShow capture support

2011-05-21 17:23:14 +02:00

dshow_pin.c

DirectShow capture support

2011-05-21 17:23:14 +02:00

dshow.c

lavdev: prefer the inclusion of avdevice.h over that of libavformat/avformat.h

2011-05-27 12:15:09 +02:00

dshow.h

lavdev: prefer the inclusion of avdevice.h over that of libavformat/avformat.h

2011-05-27 12:15:09 +02:00

dv1394.c

Merge remote-tracking branch 'qatar/master'

2011-06-03 05:19:30 +02:00

dv1394.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

fbdev.c

Merge remote-tracking branch 'qatar/master'

2011-06-24 03:07:04 +02:00

jack_audio.c

lavdev: prefer the inclusion of avdevice.h over that of libavformat/avformat.h

2011-05-27 12:15:09 +02:00

libavdevice.v

Add symbol versioning for shared libraries

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

libdc1394.c

lavdev: improve feedback in case of invalid frame rate/size

2011-06-23 08:49:49 +02:00

Makefile

Merge remote-tracking branch 'qatar/master'

2011-06-26 02:31:32 +02:00

oss_audio.c

oss,sndio: simplify by using FFMIN.

2011-06-09 22:53:17 +02:00

sdl.c

sdl: align option fields after last commit

2011-06-05 13:55:02 +02:00

sndio_common.c

lavdev: prefer the inclusion of avdevice.h over that of libavformat/avformat.h

2011-05-27 12:15:09 +02:00

sndio_common.h

lavdev: prefer the inclusion of avdevice.h over that of libavformat/avformat.h

2011-05-27 12:15:09 +02:00

sndio_dec.c

Merge remote-tracking branch 'qatar/master'

2011-05-26 03:28:22 +02:00

sndio_enc.c

oss,sndio: simplify by using FFMIN.

2011-06-09 22:53:17 +02:00

v4l2.c

Merge remote-tracking branch 'qatar/master'

2011-06-24 03:07:04 +02:00

v4l.c

lavdev: prefer the inclusion of avdevice.h over that of libavformat/avformat.h

2011-05-27 12:15:09 +02:00

vfwcap.c

Merge remote-tracking branch 'qatar/master'

2011-06-24 03:07:04 +02:00

x11grab.c

x11grab: remove a memory allocation and the associated memcpy.

2011-06-12 12:18:05 +02:00