diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-14 00:38:47 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-14 00:39:51 +0100 |
commit | 6016b8329bcaf7ce2464c6a291c00ae29a2fcb8f (patch) | |
tree | 3c518d5f749e551a8b8b591be39328f72b6b0e1b /libavcodec/indeo2data.h | |
parent | 16f619f57c07f518d4d9fa8de3f23540174ff8ef (diff) | |
parent | 05563ccacc98fd185affdbf8cbaf094caf36b852 (diff) | |
download | ffmpeg-6016b8329bcaf7ce2464c6a291c00ae29a2fcb8f.tar.gz |
Merge commit '05563ccacc98fd185affdbf8cbaf094caf36b852'
* commit '05563ccacc98fd185affdbf8cbaf094caf36b852':
dsputil: cosmetics: Lose camelCase on ff_cropTbl and ff_squareTbl names
Conflicts:
libavcodec/bit_depth_template.c
libavcodec/motionpixels_tablegen.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/indeo2data.h')
0 files changed, 0 insertions, 0 deletions