Changeset 024a5f7 in ffmpeg

Timestamp:

Apr 8, 2013, 10:47:49 AM (12 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

0138fe56

Parents:

5f49e92 (diff), 9e0f14f1 (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 commit '9e0f14f16cfc9456a691655fda7d01090bffe47e'

• commit '9e0f14f16cfc9456a691655fda7d01090bffe47e': lavc: Make pointers to ff_cropTbl const vp3: Embed idct_permutation array directly in VP3DecoderContext

Conflicts:

libavcodec/bit_depth_template.c
libavcodec/vp3.c

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

(No files)