diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-09 12:12:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-09 12:12:29 +0200 |
| commit | b63052839a6b247bd13daab74a869c8f837eda84 (patch) | |
| tree | f4960ae9f6110190f83c7bf1533a97ae68ff09fc /libavutil/cpu.h | |
| parent | f7bbe0f414f8cd495798522c61aec750ebdcf913 (diff) | |
| parent | 9752d07d33d5370f7819865fbb5e582b982aad06 (diff) | |
| download | ffmpeg-b63052839a6b247bd13daab74a869c8f837eda84.tar.gz | |
Merge commit '9752d07d33d5370f7819865fbb5e582b982aad06'
* commit '9752d07d33d5370f7819865fbb5e582b982aad06':
dirac: K&R formatting cosmetics
Conflicts:
libavcodec/dirac.c
libavcodec/dirac_parser.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/cpu.h')
0 files changed, 0 insertions, 0 deletions