Merge commit '4cd54b2f976738682cdf8a38a1719b8bba1a018c' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Feb 2015 18:19:03 +0000 (19:19 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Feb 2015 18:19:03 +0000 (19:19 +0100)
commit05c4b502165e1789f4f17a2bad27255c2f5d4201
treece3399c43df4c729e39e3ea6d44bd9629e4a22ac
parent7ca10906b4ce4bdde6d681cc3fb2f5567f362d34
parent4cd54b2f976738682cdf8a38a1719b8bba1a018c
Merge commit '4cd54b2f976738682cdf8a38a1719b8bba1a018c' into release/2.4

* commit '4cd54b2f976738682cdf8a38a1719b8bba1a018c':
  img2dec: correctly use the parsed value from -start_number

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