Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Jul 2013 10:07:35 +0000 (12:07 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Jul 2013 10:58:26 +0000 (12:58 +0200)
commitdb0384c9c962f403051d5441271311fd441f3675
treea1cb5ad0491ca2d5a871934249f0ed0f01d068e3
parent0a28a52d53e20e45d8ca8c977984742b15b774f8
parentfd8189932147a524fe43532b46baa35e8be92a1b
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dsicinav: Clip the source size to the expected maximum

Clipping the compressed size based on the uncompressed size is not correct
thus this commit is not merged, and the merge is for git metadata only

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