Merge remote-tracking branch 'lukaszmluki/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 26 Oct 2013 08:30:59 +0000 (10:30 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 26 Oct 2013 08:31:04 +0000 (10:31 +0200)
commit0feecb62abab9ec6afa98121a07941792204fad9
tree9eea12d5e3f46b355bb98f596fac14dbc3f8aade
parent7e19c549bafa9e4025d0adc59593f6541ccbe304
parentc4281705492a1c862a0faff6c3132fbdeb60d35a
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@gmx.at>