aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/arm/simple_idct_armv6.S
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-22 22:23:04 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-22 22:23:04 +0100
commit672c610d8439ec7e83ba1e1d0c5ca2388cfccfc3 (patch)
tree17a5bca7fe47fa6729fc3ec48cf9dee3ba37faa8 /libavcodec/arm/simple_idct_armv6.S
parentd6d3cfb0aa23c1f6111f71889256874d86c2cf77 (diff)
parentf9279ee74936b4990fc46287c27816ef828cc06c (diff)
downloadffmpeg-672c610d8439ec7e83ba1e1d0c5ca2388cfccfc3.tar.gz
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>
Diffstat (limited to 'libavcodec/arm/simple_idct_armv6.S')
0 files changed, 0 insertions, 0 deletions