[FFmpeg-cvslog] Merge commit '3832a6590156e6abc575bed51cbffa78617ee5fd'

[Michael Niedermayer]

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

Merge commit '3832a6590156e6abc575bed51cbffa78617ee5fd'

* commit '3832a6590156e6abc575bed51cbffa78617ee5fd':
  dsputil: Move ff_alternate_*_scan tables to mpegvideo

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

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