[FFmpeg-cvslog] Merge remote-tracking branch 'luzero/pulse'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Oct 22 01:56:57 2011 +0200| [5b602a140f3c071b67572ce5af2eb0469c5c8bed] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5b602a140f3c071b67572ce5af2eb0469c5c8bed
---