Changeset 1090f69 in ffmpeg

Timestamp:

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

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

5f49e92

Parents:

018cc6f0 (diff), aa8d8953 (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 'aa8d89536d35af0a0c8d8bac2b452ffe7b82cae5'

• commit 'aa8d89536d35af0a0c8d8bac2b452ffe7b82cae5': bfin: Don't use the vp3 idct functions if bitexact behaviour is expected

Conflicts:

libavcodec/bfin/vp3_bfin.c

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

(No files)