diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-13 00:41:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-13 00:41:40 +0100 |
| commit | e03c1af55eae6549dfd97a328eb3297faacc3a78 (patch) | |
| tree | 3b819671e07fbc6fbb2791035b02d1cc6e643bb6 /tools/ffescape.c | |
| parent | 89c5de66523b1b2895a408a213bf06e6580cdc8f (diff) | |
| parent | dff1c19140e70cd7bf868394b6f573221185928f (diff) | |
| download | ffmpeg-e03c1af55eae6549dfd97a328eb3297faacc3a78.tar.gz | |
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>
Diffstat (limited to 'tools/ffescape.c')
0 files changed, 0 insertions, 0 deletions