Merge commit '994d8f3095180ba1b2c6040a97718e931a782b34'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Mar 2015 19:54:17 +0000 (20:54 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Mar 2015 20:03:58 +0000 (21:03 +0100)
commitb7d3fbc69bb60ab2c1369ac5ba20f23565a4db8d
tree2dc3dff697c834df2385c8542f62f6f2d23c8fc3
parent75dbe4c1fa2c81b2c5cf6436295a143bdecb9e70
parent994d8f3095180ba1b2c6040a97718e931a782b34
Merge commit '994d8f3095180ba1b2c6040a97718e931a782b34'

* commit '994d8f3095180ba1b2c6040a97718e931a782b34':
  fate: Add AIC test with odd sizes

Conflicts:
tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tests/fate/video.mak
tests/ref/fate/aic-oddsize