Merge commit '05563ccacc98fd185affdbf8cbaf094caf36b852'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Mar 2014 23:38:47 +0000 (00:38 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Mar 2014 23:39:51 +0000 (00:39 +0100)
commit6016b8329bcaf7ce2464c6a291c00ae29a2fcb8f
tree3c518d5f749e551a8b8b591be39328f72b6b0e1b
parent16f619f57c07f518d4d9fa8de3f23540174ff8ef
parent05563ccacc98fd185affdbf8cbaf094caf36b852
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>
20 files changed:
libavcodec/bfin/vp3_bfin.c
libavcodec/cavs.c
libavcodec/cavsdsp.c
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/dvbsubdec.c
libavcodec/dvdsubdec.c
libavcodec/error_resilience.c
libavcodec/h264pred.c
libavcodec/imgconvert.c
libavcodec/mathtables.c
libavcodec/motionpixels_tablegen.c
libavcodec/motionpixels_tablegen.h
libavcodec/mpegvideo_enc.c
libavcodec/pgssubdec.c
libavcodec/rv30.c
libavcodec/rv30dsp.c
libavcodec/rv40dsp.c
libavcodec/snowenc.c
libavcodec/vp8dsp.c