Merge remote-tracking branch 'luzero/pulse'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 27 Oct 2011 17:46:53 +0000 (19:46 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 27 Oct 2011 17:46:53 +0000 (19:46 +0200)
commitc2553a5585c381971eca55e9e008cf4caee919fe
tree3237cc56e93a5d7f0e6dab69c20916f2d69d51aa
parent4ffed61b4938d9a3371ca9d4af0be578546a4ae0
parent94619d5e55f6142392227b855f0bff95b8e0e944
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@gmx.at>
libavdevice/pulse.c