Merge commit 'f9279ee74936b4990fc46287c27816ef828cc06c'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Mar 2014 21:23:04 +0000 (22:23 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Mar 2014 21:23:04 +0000 (22:23 +0100)
commit672c610d8439ec7e83ba1e1d0c5ca2388cfccfc3
tree17a5bca7fe47fa6729fc3ec48cf9dee3ba37faa8
parentd6d3cfb0aa23c1f6111f71889256874d86c2cf77
parentf9279ee74936b4990fc46287c27816ef828cc06c
Merge commit 'f9279ee74936b4990fc46287c27816ef828cc06c'

* commit 'f9279ee74936b4990fc46287c27816ef828cc06c':
  dsputil: Move ff_zigzag_direct and ff_crop_tab declarations to mathops.h

Conflicts:
libavcodec/imgconvert.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
14 files changed:
libavcodec/bfin/vp3dsp_init.c
libavcodec/bit_depth_template.c
libavcodec/cavsdsp.c
libavcodec/dsputil.h
libavcodec/imgconvert.c
libavcodec/indeo4data.h
libavcodec/mathops.h
libavcodec/mathtables.c
libavcodec/mss3.c
libavcodec/pgssubdec.c
libavcodec/rv30dsp.c
libavcodec/rv40dsp.c
libavcodec/vp3.c
libavcodec/vp8dsp.c