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)
commitd03fd2c8052ee80e7221ab02ab0fcb5220e92698
tree443758956fe57368f9372afd061d8809fafd8a37
parent946a106995bca70a360f5bd03fa503e8beb09cc5
parent124ec8b1303d4f29b833099ce9008e31ac6d7c86
Merge commit '124ec8b1303d4f29b833099ce9008e31ac6d7c86' into release/1.1

* commit '124ec8b1303d4f29b833099ce9008e31ac6d7c86':
  pulse: Add a wallclock option to be compatible with other other captures

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