diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-13 00:32:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-13 00:33:31 +0100 |
| commit | 89c5de66523b1b2895a408a213bf06e6580cdc8f (patch) | |
| tree | bee4f47bc015645a556412c7ed31de2f6ce32745 /ffplay.c | |
| parent | 86316039ab06bcf5c8b9c14f535f1dd072990e3b (diff) | |
| parent | 91be8df20b57a18307e90f1c4886a35ea7b28880 (diff) | |
| download | ffmpeg-89c5de66523b1b2895a408a213bf06e6580cdc8f.tar.gz | |
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>
Diffstat (limited to 'ffplay.c')
0 files changed, 0 insertions, 0 deletions