Changeset 47fc82b in ffmpeg

Timestamp:

Apr 5, 2014, 5:43:28 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

26e70fd5

Parents:

e6f69b3 (diff), 5f922043 (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: dsputil: Move DV-specific ff_zigzag248_direct table to dvdata

Conflicts:

libavcodec/dv.c

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)