Changeset e03c1af5 in ffmpeg

Timestamp:

Feb 12, 2014, 11:41:40 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

9c3478c2

Parents:

89c5de6 (diff), dff1c191 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (02/12/14 23:41:06)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (02/12/14 23:41:40)

Message:

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>

(No files)