diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-22 01:56:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-22 01:56:57 +0200 |
| commit | 5b602a140f3c071b67572ce5af2eb0469c5c8bed (patch) | |
| tree | 2a47d6f024cb6960012d958745c753eae45466ed /libavdevice/alldevices.c | |
| parent | d000c5ae7e375ddf45215c550e9b2b815d3677af (diff) | |
| parent | 796cd225dabd3b53340b7c6defc5e5e654de23d7 (diff) | |
| download | ffmpeg-5b602a140f3c071b67572ce5af2eb0469c5c8bed.tar.gz | |
Merge remote-tracking branch 'luzero/pulse'
* luzero/pulse:
pulse: cosmetics
pulse: introduce pulseaudio input
Conflicts:
Changelog
configure
libavdevice/Makefile
libavdevice/alldevices.c
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 ce2ea020cd..ace7c17ddf 100644 --- a/libavdevice/alldevices.c +++ b/libavdevice/alldevices.c @@ -47,6 +47,7 @@ void avdevice_register_all(void) REGISTER_INDEV (LAVFI, lavfi); REGISTER_INDEV (OPENAL, openal); REGISTER_INOUTDEV (OSS, oss); + REGISTER_INDEV (PULSE, pulse); REGISTER_OUTDEV (SDL, sdl); REGISTER_INOUTDEV (SNDIO, sndio); REGISTER_INDEV (V4L2, v4l2); |