diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-09 12:35:20 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-09 12:35:20 +0100 |
| commit | 71c63e799f3aedeab00538714caf7c7023b3ca2b (patch) | |
| tree | ea34e926fc796ce29ac022cf12119c568e01a221 /libavfilter/vf_mergeplanes.c | |
| parent | 45eb2a0d49c1086f5f6ed56490821da7fd3dea0b (diff) | |
| parent | c47cdf837c1b52681a84f434443e1f993757a5e9 (diff) | |
| download | ffmpeg-71c63e799f3aedeab00538714caf7c7023b3ca2b.tar.gz | |
Merge commit 'c47cdf837c1b52681a84f434443e1f993757a5e9' into release/2.2
* commit 'c47cdf837c1b52681a84f434443e1f993757a5e9':
img2dec: correctly use the parsed value from -start_number
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_mergeplanes.c')
0 files changed, 0 insertions, 0 deletions