[FFmpeg-cvslog] Merge commit '4af5310d29379283553bcd9f541a3f6c317f706e'
Michael Niedermayer
git at videolan.org
Tue Jan 22 13:55:13 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 22 13:49:45 2013 +0100| [766f0552012480934b65a1935d272f6c8cf756fe] | committer: Michael Niedermayer
Merge commit '4af5310d29379283553bcd9f541a3f6c317f706e'
* commit '4af5310d29379283553bcd9f541a3f6c317f706e':
get_bits/put_bits: K&R formatting cosmetics
Conflicts:
libavcodec/get_bits.h
libavcodec/put_bits.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=766f0552012480934b65a1935d272f6c8cf756fe
---
More information about the ffmpeg-cvslog
mailing list