Michael Niedermayer 511398031c 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>

2014-08-24 21:33:59 +02:00

12 KiB

Raw Blame History

View Raw