Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Feb 2014 23:41:06 +0000 (00:41 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Feb 2014 23:41:40 +0000 (00:41 +0100)
commite03c1af55eae6549dfd97a328eb3297faacc3a78
tree3b819671e07fbc6fbb2791035b02d1cc6e643bb6
parent89c5de66523b1b2895a408a213bf06e6580cdc8f
parentdff1c19140e70cd7bf868394b6f573221185928f
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vp9: add a new segmentation sample.

Conflicts:
tests/fate/vpx.mak
tests/ref/fate/vp9-segmentation-aq-akiyo
tests/ref/fate/vp9-segmentation-sf-akiyo

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