[FFmpeg-cvslog] Merge commit '256da0770e495176d1b2699ec6e9c7993c2a6d7b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May 30 00:42:36 2014 +0200| [5c6e94c42bcdc026071855a6b1749406b2456c8b] | committer: Michael Niedermayer

Merge commit '256da0770e495176d1b2699ec6e9c7993c2a6d7b'

* commit '256da0770e495176d1b2699ec6e9c7993c2a6d7b':
  dsputil: Move mspel_pixels_tab to the only place it is used

Conflicts:
	libavcodec/dsputil.c

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

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