Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Apr 2013 10:54:18 +0000 (12:54 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Apr 2013 10:54:18 +0000 (12:54 +0200)
* qatar/master:
  lavc: Move ff_cropTbl and ff_zigzag_direct from dsputil to mathtables

Conflicts:
libavcodec/mathtables.c

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

Simple merge