Michael Niedermayer 0138fe5656 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>

2013-04-08 12:54:18 +02:00

8.1 KiB

Raw Blame History

View Raw