OSDN Git Service

Merge remote-tracking branch 'lukaszmluki/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Nov 2013 01:08:43 +0000 (02:08 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Nov 2013 01:08:48 +0000 (02:08 +0100)
commite1351662063d6aa9c0a04b869afc88b252155de8
treee76a428240dabe9bd4b8f50d50c8bb223b1e171a
parent1a4ffa5b136a112935e7db19eb49e6042c6d5143
parentbabf20a215ffdf2ecf323a77c95c2a4c4360b371
Merge remote-tracking branch 'lukaszmluki/master'

* lukaszmluki/master:
  lavd/pulse: add ff_ prefix and fix param type
  lavd/pulse_audio_enc: fix flush return code

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