[FFmpeg-cvslog] Merge commit 'd0449e754553b0c110b6cd75f6725b82144fbd2a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jul  1 19:28:55 2014 +0200| [06e5d28e33e9e3b9e38ff958f29bba925e44d573] | committer: Michael Niedermayer

Merge commit 'd0449e754553b0c110b6cd75f6725b82144fbd2a'

* commit 'd0449e754553b0c110b6cd75f6725b82144fbd2a':
  vaapi: Update idct_permutation location after dsputil/idctdsp split

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

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