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)
* commit '3832a6590156e6abc575bed51cbffa78617ee5fd':
  dsputil: Move ff_alternate_*_scan tables to mpegvideo

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

Simple merge
Simple merge
Simple merge
Simple merge