Merge commit '83b92a855e8e08bdec484e13ee5a7c8996224772'
authorClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 15:12:41 +0000 (16:12 +0100)
committerClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 15:12:41 +0000 (16:12 +0100)
* commit '83b92a855e8e08bdec484e13ee5a7c8996224772':
  golomb: Drop disabled cruft

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

Simple merge