[FFmpeg-cvslog] Merge commit '5c22e8e4ad0852d61d5c4ba8d67d33fd72339497'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jul 18 02:33:00 2014 +0200| [4c735ee0e3d44e7c8e51c8dd519b14ac0f002bec] | committer: Michael Niedermayer

Merge commit '5c22e8e4ad0852d61d5c4ba8d67d33fd72339497'

* commit '5c22e8e4ad0852d61d5c4ba8d67d33fd72339497':
  armv6: Accelerate ff_imdct_half for general case (mdct_bits != 6)

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

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