Michael Niedermayer 25d8099beb Merge remote-tracking branch 'newdev/master' ...

* newdev/master:
  ac3enc: Add codec-specific options for writing AC-3 metadata.
NOT MERGED:  Remove arrozcru URL from documentation
  sndio support for playback and record

Conflicts:
	doc/faq.texi
	doc/general.texi

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

2011-03-28 01:50:36 +02:00

..

alldevices.c

Merge remote-tracking branch 'newdev/master'

2011-03-28 01:50:36 +02:00

alsa-audio-common.c

ALSA: implement channel layout for playback.

2011-03-26 16:50:09 +01:00

alsa-audio-dec.c

Replace FFmpeg with Libav in licence headers

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

alsa-audio-enc.c

ALSA: implement channel layout for playback.

2011-03-26 16:50:09 +01:00

alsa-audio.h

ALSA: implement channel layout for playback.

2011-03-26 16:50:09 +01:00

avdevice.c

Replace FFmpeg with Libav in licence headers

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

avdevice.h

sndio support for playback and record

2011-03-27 10:46:45 +02:00

bktr.c

Replace FFmpeg with Libav in licence headers

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

dv1394.c

Replace FFmpeg with Libav in licence headers

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

dv1394.h

Replace FFmpeg with Libav in licence headers

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

fbdev.c

fbdev: fix check on nanosleep return vale

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

jack_audio.c

Replace FFmpeg with Libav in licence headers

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

libavdevice.v

Add symbol versioning for shared libraries

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

libdc1394.c

Replace FFmpeg with Libav in licence headers

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

Makefile

Merge remote-tracking branch 'newdev/master'

2011-03-28 01:50:36 +02:00

oss_audio.c

Replace FFmpeg with Libav in licence headers

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

sndio_common.c

sndio support for playback and record

2011-03-27 10:46:45 +02:00

sndio_common.h

sndio support for playback and record

2011-03-27 10:46:45 +02:00

sndio_dec.c

sndio support for playback and record

2011-03-27 10:46:45 +02:00

sndio_enc.c

sndio support for playback and record

2011-03-27 10:46:45 +02:00

v4l2.c

Replace FFmpeg with Libav in licence headers

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

v4l.c

Replace FFmpeg with Libav in licence headers

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

vfwcap.c

Replace FFmpeg with Libav in licence headers

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

x11grab.c

Replace FFmpeg with Libav in licence headers

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