Changeset 0138fe56 in ffmpeg

Timestamp:

Apr 8, 2013, 10:54:18 AM (12 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

ad6a50c0

Parents:

024a5f7 (diff), d2ec6ea6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

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>

(No files)