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)
* 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>
1  2 
tests/fate/vpx.mak

Simple merge