
* commit '015821229f96bf7e677f2a711a58dbea3009f574': vp3: Use full transpose for all IDCTs Conflicts: libavcodec/vp3.c libavcodec/vp3dsp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '015821229f96bf7e677f2a711a58dbea3009f574': vp3: Use full transpose for all IDCTs Conflicts: libavcodec/vp3.c libavcodec/vp3dsp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>