Merge commit 'a97d8cc16e0da30c9ffefa1ede2a0adf3db5f3f8'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 8 May 2013 09:54:23 +0000 (11:54 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 8 May 2013 09:54:29 +0000 (11:54 +0200)
commite077ba801644c07027e7fee14018dc0f49d01a51
tree3771e7717452f3fce0b1f550a05714e64e3008af
parent1bad40ef27237dcccf12a106ed870aa303ed4d44
parenta97d8cc16e0da30c9ffefa1ede2a0adf3db5f3f8
Merge commit 'a97d8cc16e0da30c9ffefa1ede2a0adf3db5f3f8'

* commit 'a97d8cc16e0da30c9ffefa1ede2a0adf3db5f3f8':
  indeo3: use unaligned reads on reference blocks.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/indeo3.c