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

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Oct 27 19:46:53 2011 +0200| [c2553a5585c381971eca55e9e008cf4caee919fe] | committer: Michael Niedermayer

Merge remote-tracking branch 'luzero/pulse'

* luzero/pulse:
  pulse: set the device from the avformat filename

Conflicts:
	libavdevice/pulse.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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