Merge commit '91be8df20b57a18307e90f1c4886a35ea7b28880'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Feb 2014 23:32:00 +0000 (00:32 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Feb 2014 23:33:31 +0000 (00:33 +0100)
commit89c5de66523b1b2895a408a213bf06e6580cdc8f
treebee4f47bc015645a556412c7ed31de2f6ce32745
parent86316039ab06bcf5c8b9c14f535f1dd072990e3b
parent91be8df20b57a18307e90f1c4886a35ea7b28880
Merge commit '91be8df20b57a18307e90f1c4886a35ea7b28880'

* commit '91be8df20b57a18307e90f1c4886a35ea7b28880':
  vp9: add fate sample for parallelmode.

Conflicts:
tests/fate/vpx.mak
tests/ref/fate/vp9-parallelmode-akiyo

See: 1d6bb21348711a05f25123b9aad065a08e1e5b58
Merged-by: Michael Niedermayer <michaelni@gmx.at>
tests/fate/vpx.mak