[FFmpeg-cvslog] Merge commit '0b016eb99d38738e2c53e36549a4732a0f863b2e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Feb  9 11:43:23 2013 +0100| [55151aa1013b6bf83b82b5535a7d085202fe49b3] | committer: Michael Niedermayer

Merge commit '0b016eb99d38738e2c53e36549a4732a0f863b2e'

* commit '0b016eb99d38738e2c53e36549a4732a0f863b2e':
  dsputil: Move ff_block_permute to mpegvideo_enc

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

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