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 /Changelog | |
| parent | d000c5ae7e375ddf45215c550e9b2b815d3677af (diff) | |
| parent | 796cd225dabd3b53340b7c6defc5e5e654de23d7 (diff) | |
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 'Changelog')
| -rw-r--r-- | Changelog | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -68,7 +68,7 @@ easier to use. The changes are: - Ut Video decoder - Speex encoding via libspeex - 4:2:2 H.264 decoding support - +- Pulseaudio input device version 0.8: |