diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-03 11:44:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-03 11:44:11 +0200 |
| commit | 7cb5467a52011d194289035b51e27c4df80bf2a2 (patch) | |
| tree | 09df9a077d623d2926411acc3697d1e377ce90c1 /libavutil/cpu.c | |
| parent | 2976e2a102cd8202e0f7b9e601d62354b7ad1c72 (diff) | |
| parent | 46ce9ded96ffcb798b03da894cdb5fdac376a6ee (diff) | |
Merge commit '46ce9ded96ffcb798b03da894cdb5fdac376a6ee'
* commit '46ce9ded96ffcb798b03da894cdb5fdac376a6ee':
tiff: K&R formatting cosmetics
Conflicts:
libavcodec/tiff.c
libavcodec/tiff.h
libavcodec/tiffenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/cpu.c')
0 files changed, 0 insertions, 0 deletions