diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-14 02:04:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-14 02:04:38 +0200 |
| commit | fb8a10db5d77424774493376b5d0412808bb0491 (patch) | |
| tree | a89ad729bc5e983a4393d9a5977da684994519fc /libavcodec/g722.h | |
| parent | 5970f4bb027c4eb8aca3cdca677fcca03aef1e82 (diff) | |
| parent | 14ddbb477faef359983151b763fd8b20e578651b (diff) | |
| download | ffmpeg-fb8a10db5d77424774493376b5d0412808bb0491.tar.gz | |
Merge commit '14ddbb477faef359983151b763fd8b20e578651b'
* commit '14ddbb477faef359983151b763fd8b20e578651b':
cavs: K&R formatting cosmetics
Conflicts:
libavcodec/cavs.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g722.h')
0 files changed, 0 insertions, 0 deletions