[FFmpeg-cvslog] Merge commit '05563ccacc98fd185affdbf8cbaf094caf36b852'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 14 00:38:47 2014 +0100| [6016b8329bcaf7ce2464c6a291c00ae29a2fcb8f] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6016b8329bcaf7ce2464c6a291c00ae29a2fcb8f
---