[FFmpeg-cvslog] Merge remote-tracking branch 'lukaszmluki/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Oct 26 10:30:59 2013 +0200| [0feecb62abab9ec6afa98121a07941792204fad9] | committer: Michael Niedermayer

Merge remote-tracking branch 'lukaszmluki/master'

* lukaszmluki/master:
  lavd/pulse_audio_enc: avoid vars in for()
  lavd/pulse_audio_enc: add another default to stream name

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

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