-
Michael Niedermayer authored
* commit '9fcc6322': pulse: Add a wallclock option to be compatible with other other captures Conflicts: libavdevice/pulse_audio_dec.c Merged-by:
Michael Niedermayer <michaelni@gmx.at>
e940d15a
* commit '9fcc6322': pulse: Add a wallclock option to be compatible with other other captures Conflicts: libavdevice/pulse_audio_dec.c Merged-by:Michael Niedermayer <michaelni@gmx.at>