[FFmpeg-cvslog] Merge remote-tracking branch 'newdev/master'

Mon Mar 28 02:25:34 CEST 2011

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 28 01:50:36 2011 +0200| [25d8099beb4c7eb93539f9162af1336ef7130fed] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=25d8099beb4c7eb93539f9162af1336ef7130fed
---