Merge remote-tracking branch 'luzero/pulse'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 21 Oct 2011 23:56:57 +0000 (01:56 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 21 Oct 2011 23:56:57 +0000 (01:56 +0200)
commit5b602a140f3c071b67572ce5af2eb0469c5c8bed
tree2a47d6f024cb6960012d958745c753eae45466ed
parentd000c5ae7e375ddf45215c550e9b2b815d3677af
parent796cd225dabd3b53340b7c6defc5e5e654de23d7
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>
Changelog
configure
libavdevice/Makefile
libavdevice/alldevices.c