[FFmpeg-cvslog] Merge commit 'e2dcb8208e8f6cffef58a85127765047f5ef8868' into release/0.10

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Wed Sep 25 22:54:54 2013 +0200| [3308b443f9342cd597a9d7440d2315f0a65b1566] | committer: Michael Niedermayer

Merge commit 'e2dcb8208e8f6cffef58a85127765047f5ef8868' into release/0.10

* commit 'e2dcb8208e8f6cffef58a85127765047f5ef8868':
  indeo5: return proper error codes
  indeo4: Validate scantable dimension

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3308b443f9342cd597a9d7440d2315f0a65b1566
---