diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-19 20:40:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-19 20:40:02 +0200 |
| commit | 75ef907db80f77912f8e7815e75cf401dd68e2f2 (patch) | |
| tree | f6cec14931b494607ee2d5836ec513ada04bd073 /libavformat/sox.h | |
| parent | 01a39a978c143747b50d0b2660cd100c96722cbd (diff) | |
| parent | 6dfd99c93808d6504dd5cb1fad847d68cb179352 (diff) | |
| download | ffmpeg-75ef907db80f77912f8e7815e75cf401dd68e2f2.tar.gz | |
Merge commit '6dfd99c93808d6504dd5cb1fad847d68cb179352'
* commit '6dfd99c93808d6504dd5cb1fad847d68cb179352':
fate: add tests for SGI RLE and MVC1&2 decoders
Conflicts:
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/sox.h')
0 files changed, 0 insertions, 0 deletions