diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-28 03:50:36 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-28 03:50:36 +0400 |
commit | 25d8099beb4c7eb93539f9162af1336ef7130fed (patch) | |
tree | 4f668222da738409baf5ad8a1ee9d1c9f9004f96 /libavdevice/alldevices.c | |
parent | 57e2ded4234356c26bf92b0a627ec383ea8d288f (diff) | |
parent | 991f3de1bb696a55f7604e4b7d53492299fe44b5 (diff) |
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 'libavdevice/alldevices.c')
-rw-r--r-- | libavdevice/alldevices.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavdevice/alldevices.c b/libavdevice/alldevices.c index 0c000dcb86..a0c9b08c6f 100644 --- a/libavdevice/alldevices.c +++ b/libavdevice/alldevices.c @@ -45,6 +45,7 @@ void avdevice_register_all(void) REGISTER_INDEV (FBDEV, fbdev); REGISTER_INDEV (JACK, jack); REGISTER_INOUTDEV (OSS, oss); + REGISTER_INOUTDEV (SNDIO, sndio); REGISTER_INDEV (V4L2, v4l2); REGISTER_INDEV (V4L, v4l); REGISTER_INDEV (VFWCAP, vfwcap); |