Merge commit 'f7407f56cbf820a147bd77d728ac9a72c587cc56'
authorClément Bœsch <u@pkh.me>
Sat, 1 Apr 2017 09:26:23 +0000 (11:26 +0200)
committerClément Bœsch <u@pkh.me>
Sat, 1 Apr 2017 09:26:23 +0000 (11:26 +0200)
commit52e6fb9c597fe0d741f939c31a692362f4ea3136
treee2688d90cba0d9e64e533037a37906064602a86b
parent6516c62ec0e4feb5389bc1ce7030bfb2eae258f9
parentf7407f56cbf820a147bd77d728ac9a72c587cc56
Merge commit 'f7407f56cbf820a147bd77d728ac9a72c587cc56'

* commit 'f7407f56cbf820a147bd77d728ac9a72c587cc56':
  golomb: Replace __PRETTY_FUNCTION__ with __func__ for tracing

Merged-by: Clément Bœsch <u@pkh.me>
libavcodec/golomb.h