[FFmpeg-cvslog] Merge commit '91d305790ea0f6fe0f54b48236da42181c39c18b'
Michael Niedermayer
git at videolan.org
Tue Sep 2 22:51:17 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Sep 2 22:18:12 2014 +0200| [9e59a7be1cc9bd840d91f78c55b7f4953659319b] | committer: Michael Niedermayer
Merge commit '91d305790ea0f6fe0f54b48236da42181c39c18b'
* commit '91d305790ea0f6fe0f54b48236da42181c39c18b':
get_bits: Rename HAVE_BITS_REMAINING --> BITS_AVAILABLE
Conflicts:
libavcodec/golomb.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9e59a7be1cc9bd840d91f78c55b7f4953659319b
---
More information about the ffmpeg-cvslog
mailing list