Changeset 5f49e92 in ffmpeg

Timestamp:

Apr 8, 2013, 10:40:26 AM (12 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

024a5f7

Parents:

1090f69 (diff), 610b18e2 (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 '610b18e2e3d8ef5eca3e78f33a0625689b8d2bb9'

• commit '610b18e2e3d8ef5eca3e78f33a0625689b8d2bb9': x86: qpel: Move fullpel and l2 functions to a separate file bfin: Make vp3 functions static

Conflicts:

libavcodec/bfin/vp3_bfin.c
libavcodec/x86/Makefile

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

(No files)