diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-28 01:50:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-28 01:50:36 +0200 |
| commit | 25d8099beb4c7eb93539f9162af1336ef7130fed (patch) | |
| tree | 4f668222da738409baf5ad8a1ee9d1c9f9004f96 /doc/outdevs.texi | |
| parent | 57e2ded4234356c26bf92b0a627ec383ea8d288f (diff) | |
| parent | 991f3de1bb696a55f7604e4b7d53492299fe44b5 (diff) | |
| download | ffmpeg-25d8099beb4c7eb93539f9162af1336ef7130fed.tar.gz | |
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>
Diffstat (limited to 'doc/outdevs.texi')
| -rw-r--r-- | doc/outdevs.texi | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/outdevs.texi b/doc/outdevs.texi index 3c0acee984..fbb312363c 100644 --- a/doc/outdevs.texi +++ b/doc/outdevs.texi @@ -26,4 +26,8 @@ ALSA (Advanced Linux Sound Architecture) output device. OSS (Open Sound System) output device. +@section sndio + +sndio audio output device. + @c man end OUTPUT DEVICES |