Merge commit 'b4987f72197e0c62cf2633bf835a9c32d2a445ae'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 18 Jul 2014 19:55:55 +0000 (21:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 18 Jul 2014 20:01:17 +0000 (22:01 +0200)
commit42d326353c17085a98f0e81844f0c6320d70e8f3
treeb3ca4f4affde4d81b6e6f826828fdbaecb9d2a17
parentf6ed5df9c00c3fda2571ccc75e3055c215e4fc1a
parentb4987f72197e0c62cf2633bf835a9c32d2a445ae
Merge commit 'b4987f72197e0c62cf2633bf835a9c32d2a445ae'

* commit 'b4987f72197e0c62cf2633bf835a9c32d2a445ae':
  idct: Convert IDCT permutation #defines to an enum

Conflicts:
libavcodec/idctdsp.c
libavcodec/x86/cavsdsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
19 files changed:
libavcodec/arm/idctdsp_init_arm.c
libavcodec/arm/idctdsp_init_armv5te.c
libavcodec/arm/idctdsp_init_armv6.c
libavcodec/arm/idctdsp_init_neon.c
libavcodec/cavsdsp.c
libavcodec/eamad.c
libavcodec/eatgq.c
libavcodec/eatqi.c
libavcodec/idctdsp.c
libavcodec/idctdsp.h
libavcodec/mpegvideo_enc.c
libavcodec/ppc/idctdsp.c
libavcodec/proresdsp.c
libavcodec/wmv2.c
libavcodec/wmv2dsp.c
libavcodec/x86/cavsdsp.c
libavcodec/x86/idctdsp_init.c
libavcodec/x86/mpegvideoenc_template.c
libavcodec/x86/proresdsp_init.c