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)
* commit 'f7407f56cbf820a147bd77d728ac9a72c587cc56':
  golomb: Replace __PRETTY_FUNCTION__ with __func__ for tracing

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

Simple merge