diff options
| author | Michael Niedermayer <[email protected]> | 2013-04-11 22:04:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-04-11 22:22:06 +0200 |
| commit | b2175b0f2a7cfdcc784ec2eabab4f6da3b0e6979 (patch) | |
| tree | c33d11aa28730f9025b95e3c7c935def76fa29a3 /libavcodec/get_bits.h | |
| parent | 9ab221f8d82da9e2cf1503cc5db115838d766d97 (diff) | |
| parent | 93e65e9a6c0895f869752a66731d9b2ec3916467 (diff) | |
Merge commit '93e65e9a6c0895f869752a66731d9b2ec3916467'
* commit '93e65e9a6c0895f869752a66731d9b2ec3916467':
Cosmetics, restore alphabetic order in atomics lists.
Conflicts:
libavutil/Makefile
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavcodec/get_bits.h')
0 files changed, 0 insertions, 0 deletions