diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-31 13:14:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-31 13:14:06 +0100 |
| commit | 6ddda83c3f9334511e606d4548a8f13816b71184 (patch) | |
| tree | 21d70bff385aecb551120ab3e8d51f51eec7cd63 /libavcodec/audioconvert.c | |
| parent | 87350d6b44b245d6b8cd28dc499d0fb9dbf15dad (diff) | |
| parent | 64bb3fa6b7f5b2db22b7577585d5861be24eebd8 (diff) | |
| download | ffmpeg-6ddda83c3f9334511e606d4548a8f13816b71184.tar.gz | |
Merge commit '64bb3fa6b7f5b2db22b7577585d5861be24eebd8'
* commit '64bb3fa6b7f5b2db22b7577585d5861be24eebd8':
cavs: cosmetics, reformat top part
cavsdec: cosmetics, reformat
libavcodec/utils: Add braces to shut up gcc warnings
Conflicts:
libavcodec/cavsdec.c
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/audioconvert.c')
0 files changed, 0 insertions, 0 deletions