[FFmpeg-cvslog] Merge commit '1274ea8dbaec44355bde07f6bb31fec0c4e6fd2d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Sep  8 00:54:55 2014 +0200| [f044fc03727dcbe7535b393e06d8ab1bc0312a9c] | committer: Michael Niedermayer

Merge commit '1274ea8dbaec44355bde07f6bb31fec0c4e6fd2d'

* commit '1274ea8dbaec44355bde07f6bb31fec0c4e6fd2d':
  Split off floating point AAN (I)DCT into separate components

Conflicts:
	configure
	libavcodec/Makefile
	libavcodec/dct-test.c
	libavcodec/idctdsp.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f044fc03727dcbe7535b393e06d8ab1bc0312a9c
---