[FFmpeg-cvslog] Merge commit 'aa8d89536d35af0a0c8d8bac2b452ffe7b82cae5'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Apr  8 12:18:29 2013 +0200| [1090f69386abefc0a081dd000ae8187243425f71] | committer: Michael Niedermayer

Merge commit 'aa8d89536d35af0a0c8d8bac2b452ffe7b82cae5'

* commit 'aa8d89536d35af0a0c8d8bac2b452ffe7b82cae5':
  bfin: Don't use the vp3 idct functions if bitexact behaviour is expected

Conflicts:
	libavcodec/bfin/vp3_bfin.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1090f69386abefc0a081dd000ae8187243425f71
---