Merge commit '91d305790ea0f6fe0f54b48236da42181c39c18b'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Sep 2014 20:18:12 +0000 (22:18 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Sep 2014 20:18:12 +0000 (22:18 +0200)
commit9e59a7be1cc9bd840d91f78c55b7f4953659319b
tree161ab63e1dcaacffcd06fe7723591966586650a3
parentc8be5258dec928119fab414341b13c0cf5405294
parent91d305790ea0f6fe0f54b48236da42181c39c18b
Merge commit '91d305790ea0f6fe0f54b48236da42181c39c18b'

* commit '91d305790ea0f6fe0f54b48236da42181c39c18b':
  get_bits: Rename HAVE_BITS_REMAINING --> BITS_AVAILABLE

Conflicts:
libavcodec/golomb.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/get_bits.h
libavcodec/golomb.h