diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-22 13:49:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-22 13:49:45 +0100 |
| commit | 766f0552012480934b65a1935d272f6c8cf756fe (patch) | |
| tree | ac5f7e026853cb7af6bdc3a58eb250493de56a1a /doc/git-howto.txt | |
| parent | b4a7f4d018aaeb29d18d5982e7234e472b58bac6 (diff) | |
| parent | 4af5310d29379283553bcd9f541a3f6c317f706e (diff) | |
| download | ffmpeg-766f0552012480934b65a1935d272f6c8cf756fe.tar.gz | |
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@gmx.at>
Diffstat (limited to 'doc/git-howto.txt')
0 files changed, 0 insertions, 0 deletions