Merge commit '404731bd20e1df5880e6fe381e975ba48afc75b2'

Browse Source

* commit '404731bd20e1df5880e6fe381e975ba48afc75b2':
  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: Michael Niedermayer <michaelni@gmx.at>

pull/88/head

Michael Niedermayer 10 years ago

parent a59d922d24 404731bd20

commit 42196083fe

Whitespace

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Split View

Diff Options

Show Stats Download Patch File Download Diff File

Diff Content Not Available