Merge remote-tracking branch 'newdev/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 27 Mar 2011 23:50:36 +0000 (01:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 27 Mar 2011 23:50:36 +0000 (01:50 +0200)
commit25d8099beb4c7eb93539f9162af1336ef7130fed
tree4f668222da738409baf5ad8a1ee9d1c9f9004f96
parent57e2ded4234356c26bf92b0a627ec383ea8d288f
parent991f3de1bb696a55f7604e4b7d53492299fe44b5
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>
12 files changed:
Changelog
configure
doc/encoders.texi
doc/indevs.texi
doc/outdevs.texi
libavcodec/ac3.h
libavcodec/ac3dec.c
libavcodec/ac3enc.c
libavcodec/ac3enc_fixed.c
libavcodec/ac3enc_float.c
libavdevice/Makefile
libavdevice/alldevices.c