[FFmpeg-cvslog] Merge commit '424b929b5cb9ca4094099f25179829260d4b0fa3'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Aug 24 21:01:29 2014 +0200| [511398031cc9991a0f4eb9dcaca5b7d9ca9c636d] | committer: Michael Niedermayer

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 at gmx.at>

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