Merge commit '3832a6590156e6abc575bed51cbffa78617ee5fd'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 May 2014 22:30:42 +0000 (00:30 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 29 May 2014 22:30:45 +0000 (00:30 +0200)
commita9a312d299c785b4b4655ab70753aa5a2a933aae
treea12a4b9835f1d17a649de776c34980f7ea4484e5
parentc814a6c778b415143b5b984bf996978225c0255a
parent3832a6590156e6abc575bed51cbffa78617ee5fd
Merge commit '3832a6590156e6abc575bed51cbffa78617ee5fd'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h