Commit 42196083 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '404731bd'

* commit '404731bd':
  pulse: Set the wallclock option as default

Conflicts:
	libavdevice/pulse_audio_dec.c

No change, the option was already default in FFmpeg since a long time
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents a59d922d 404731bd
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment