diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-14 01:09:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-14 01:09:57 +0100 |
| commit | b7a5f5dc6662ed3d4641063ba62d3d03021db9f8 (patch) | |
| tree | e79eccd272b3499bec7eaea8fb9f7322187fcddb /libavcodec/libfdk-aacdec.c | |
| parent | d926c4b240edd86d9ee5c1b449968ac91eeaa918 (diff) | |
| parent | a36947c167d7278b891453083b57dc56b7a7f5c5 (diff) | |
| download | ffmpeg-b7a5f5dc6662ed3d4641063ba62d3d03021db9f8.tar.gz | |
Merge commit 'a36947c167d7278b891453083b57dc56b7a7f5c5'
* commit 'a36947c167d7278b891453083b57dc56b7a7f5c5':
dsputilenc_mmx: K&R formatting cosmetics
Conflicts:
libavcodec/x86/dsputilenc_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libfdk-aacdec.c')
0 files changed, 0 insertions, 0 deletions