Merge commit '124ec8b1303d4f29b833099ce9008e31ac6d7c86' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Aug 2014 19:07:32 +0000 (21:07 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Aug 2014 19:07:56 +0000 (21:07 +0200)
* commit '124ec8b1303d4f29b833099ce9008e31ac6d7c86':
  pulse: Add a wallclock option to be compatible with other other captures

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

Simple merge