Merge commit '424b929b5cb9ca4094099f25179829260d4b0fa3'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Aug 2014 19:01:29 +0000 (21:01 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Aug 2014 19:33:59 +0000 (21:33 +0200)
commit511398031cc9991a0f4eb9dcaca5b7d9ca9c636d
tree2654d06bb5eca1ab792ec34d7277b56a9bc7f671
parentc2c4cee866926cb95b2b1a4b28fff9caa4177c7e
parent424b929b5cb9ca4094099f25179829260d4b0fa3
Merge commit '424b929b5cb9ca4094099f25179829260d4b0fa3'

* commit '424b929b5cb9ca4094099f25179829260d4b0fa3':
  pulse: Add a wallclock option to be compatible with other other captures

Conflicts:
libavdevice/pulse_audio_dec.c

wallclock mode was supported and default in FFmpeg already before this commit.
its thus left the default

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavdevice/pulse_audio_dec.c