Merge commit '610b18e2'
* commit '610b18e2': 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>
Showing
Please
register
or
sign in
to comment