diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-02 22:18:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-02 22:18:12 +0200 |
| commit | 9e59a7be1cc9bd840d91f78c55b7f4953659319b (patch) | |
| tree | 161ab63e1dcaacffcd06fe7723591966586650a3 /libavcodec/arm | |
| parent | c8be5258dec928119fab414341b13c0cf5405294 (diff) | |
| parent | 91d305790ea0f6fe0f54b48236da42181c39c18b (diff) | |
| download | ffmpeg-9e59a7be1cc9bd840d91f78c55b7f4953659319b.tar.gz | |
Merge commit '91d305790ea0f6fe0f54b48236da42181c39c18b'
* commit '91d305790ea0f6fe0f54b48236da42181c39c18b':
get_bits: Rename HAVE_BITS_REMAINING --> BITS_AVAILABLE
Conflicts:
libavcodec/golomb.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm')
0 files changed, 0 insertions, 0 deletions