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)
commit0138fe56563bc7aa59fb69fe81bcf3f5718b17a5
treeb7eda67afbea295f9637603012333e6173603548
parent024a5f72eec54b9a3fcaa6fc568ae1e21ac0a6a6
parentd2ec6ea6c6c0276aaf0063c5a7290f8e11fcdb06
Merge remote-tracking branch 'qatar/master'

* 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>
libavcodec/mathtables.c