Merge commit '3aba00b1b331461611d32cfd56ebe8334f6d1b93' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 02:03:06 +0000 (03:03 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 02:03:17 +0000 (03:03 +0100)
commit55c6a482d4fcc031d76bdd6068e78ec9b4c4bec6
treed8cb30cc1600e622c713b32e007f81b6956ab4aa
parentfaa67e9777ebaece5d80456213a82d92b92e4101
parent3aba00b1b331461611d32cfd56ebe8334f6d1b93
Merge commit '3aba00b1b331461611d32cfd56ebe8334f6d1b93' into release/2.4

* commit '3aba00b1b331461611d32cfd56ebe8334f6d1b93':
  indeo3: check ff_set_dimensions return value

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