Merge commit '456ffec35d55288d589aa1901919e038c3427f30'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 15 Jan 2015 01:05:17 +0000 (02:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 15 Jan 2015 01:35:28 +0000 (02:35 +0100)
commit140dfd14fdab67daf9f067509b09a667cbf788d4
tree8e173ef919b7e715e0d4e4ea5f92783d7f1de974
parent3cfd07a53fd91becb7ab07ec9f6250d3faaeb381
parent456ffec35d55288d589aa1901919e038c3427f30
Merge commit '456ffec35d55288d589aa1901919e038c3427f30'

* commit '456ffec35d55288d589aa1901919e038c3427f30':
  img2dec: correctly use the parsed value from -start_number

No change, start_number works fine without this change
and does not work with it

Merged-by: Michael Niedermayer <michaelni@gmx.at>