Merge commit '404731bd20e1df5880e6fe381e975ba48afc75b2'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 27 Aug 2014 18:51:39 +0000 (20:51 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 27 Aug 2014 18:51:39 +0000 (20:51 +0200)
commit42196083fe6336095d113f2e2da80fe6660519c7
tree2aa34bf1e1ad384c933ca47b8077ba3afb1f6c32
parenta59d922d24883aabb3d43901aba876495a4e9430
parent404731bd20e1df5880e6fe381e975ba48afc75b2
Merge commit '404731bd20e1df5880e6fe381e975ba48afc75b2'

* 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>