
* commit '5941978e71d2c3a8e2a7e87951e081e0b2e77da9': vp3: bfin: Transpose the IDCTs Conflicts: libavcodec/bfin/vp3_bfin.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '5941978e71d2c3a8e2a7e87951e081e0b2e77da9': vp3: bfin: Transpose the IDCTs Conflicts: libavcodec/bfin/vp3_bfin.c Merged-by: Michael Niedermayer <michaelni@gmx.at>