Merge commit '1274ea8dbaec44355bde07f6bb31fec0c4e6fd2d'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 7 Sep 2014 22:54:55 +0000 (00:54 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 7 Sep 2014 22:54:55 +0000 (00:54 +0200)
commitf044fc03727dcbe7535b393e06d8ab1bc0312a9c
treea45d030361c42e9c650f4c2544f6307625ad04ec
parent1a59a288380ab208914c5e8d94f688a6f75954ae
parent1274ea8dbaec44355bde07f6bb31fec0c4e6fd2d
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@gmx.at>
configure
libavcodec/Makefile
libavcodec/dct-test.c
libavcodec/fdctdsp.c
libavcodec/idctdsp.c
libavcodec/mpegvideo_enc.c