Merge commit 'e2dcb8208e8f6cffef58a85127765047f5ef8868' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 25 Sep 2013 20:54:54 +0000 (22:54 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 25 Sep 2013 20:55:03 +0000 (22:55 +0200)
commit3308b443f9342cd597a9d7440d2315f0a65b1566
tree8fcd08caf65c6256e60d1b1ed15ca317304f4ad2
parent91ad27e8f5fb931eb2e6d810d4090e570ff5c3a7
parente2dcb8208e8f6cffef58a85127765047f5ef8868
Merge commit 'e2dcb8208e8f6cffef58a85127765047f5ef8868' into release/0.10

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/indeo4.c
libavcodec/indeo5.c