diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-19 01:06:29 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-19 01:06:29 +0100 |
commit | 543a46e0d1f32ab162f2dc9fd0233d9831b6f805 (patch) | |
tree | 23f3f1bcb5a8a732367d1adae68496e6c0385900 /libavutil/mathematics.c | |
parent | 823674751196e382c1d6334b8c92839f95d0ba9e (diff) | |
parent | 1ea9fa15c3f9074f6199f68bdd6258c5a2bb89e0 (diff) | |
download | ffmpeg-543a46e0d1f32ab162f2dc9fd0233d9831b6f805.tar.gz |
Merge commit '1ea9fa15c3f9074f6199f68bdd6258c5a2bb89e0'
* commit '1ea9fa15c3f9074f6199f68bdd6258c5a2bb89e0':
libopenjpeg: K&R formatting cosmetics
Conflicts:
libavcodec/libopenjpegdec.c
libavcodec/libopenjpegenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/mathematics.c')
0 files changed, 0 insertions, 0 deletions