Michael Niedermayer 42d326353c 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>

2014-07-18 22:01:17 +02:00

2.3 KiB

Raw Blame History

View Raw