diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-29 20:25:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-29 20:25:23 +0200 |
| commit | affd5018ac35617460b567f0e8e712d4d2d34c58 (patch) | |
| tree | f7d14a1ca8c3e1189f1503f160a2e79a6fd80a08 /tests/filtergraphs | |
| parent | 9a0e40ec8c0c0b04f32173f65ef73a6cc370d17a (diff) | |
| parent | 00a61ac7559baf4768953f05346feccc965392b2 (diff) | |
| download | ffmpeg-affd5018ac35617460b567f0e8e712d4d2d34c58.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Recognize j2k as file suffix for the image2 muxer.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/filtergraphs')
0 files changed, 0 insertions, 0 deletions