Merge commit '5941978e71d2c3a8e2a7e87951e081e0b2e77da9'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 15 Apr 2013 22:50:33 +0000 (00:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 15 Apr 2013 22:50:33 +0000 (00:50 +0200)
* commit '5941978e71d2c3a8e2a7e87951e081e0b2e77da9':
  vp3: bfin: Transpose the IDCTs

Conflicts:
libavcodec/bfin/vp3_bfin.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/bfin/vp3_bfin.c

Simple merge