diff options
| author | Michael Niedermayer <[email protected]> | 2013-06-28 10:00:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-06-28 10:00:51 +0200 |
| commit | 1bcfb1eea836e3c357732ece6d96f5c87938b6d6 (patch) | |
| tree | 5078deb27b3de5a85c1646437b9fcf545c5005a8 /libavutil/rc4.h | |
| parent | ef906390043010cde8844ec30da79926f2f8b846 (diff) | |
| parent | 6d8629aac13692447b54eac795bf74007ebf8987 (diff) | |
Merge commit '6d8629aac13692447b54eac795bf74007ebf8987'
* commit '6d8629aac13692447b54eac795bf74007ebf8987':
aac: K&R formatting cosmetics
Conflicts:
libavcodec/aacdec.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavutil/rc4.h')
0 files changed, 0 insertions, 0 deletions