Merge commit 'c47cdf837c1b52681a84f434443e1f993757a5e9' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Mar 2015 11:35:20 +0000 (12:35 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Mar 2015 11:35:20 +0000 (12:35 +0100)
commit71c63e799f3aedeab00538714caf7c7023b3ca2b
treeea34e926fc796ce29ac022cf12119c568e01a221
parent45eb2a0d49c1086f5f6ed56490821da7fd3dea0b
parentc47cdf837c1b52681a84f434443e1f993757a5e9
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>