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)
* 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>

Trivial merge