diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 00:41:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 00:41:47 +0100 |
| commit | 17a5dbacf50cafbf4034732ad09f252c076bf26c (patch) | |
| tree | d5dc875bcfa1bf2c1dc8e67b8ec4fc781726bd94 /libavcodec/aacdectab.h | |
| parent | b28c37156782e563341e1bccc1a15dfbc01a569f (diff) | |
| parent | a801453423420915425f902bf9f9cbe982a55d87 (diff) | |
| download | ffmpeg-17a5dbacf50cafbf4034732ad09f252c076bf26c.tar.gz | |
Merge commit 'a801453423420915425f902bf9f9cbe982a55d87'
* commit 'a801453423420915425f902bf9f9cbe982a55d87':
g2meet: K&R formatting cosmetics
Conflicts:
libavcodec/g2meet.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aacdectab.h')
0 files changed, 0 insertions, 0 deletions