Merge commit 'c6d7c201dfa80502cb6cefbee7dc9160cedb5187'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Nov 2014 13:29:26 +0000 (14:29 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Nov 2014 13:29:52 +0000 (14:29 +0100)
commitdfa0800c414a66ceebf394bb6d4208cd68673e4c
tree086ef75be3e04308b0b6fd6061a25189b0322a6b
parentecb748866e00841e2e00e2c9c3438391a9e9e760
parentc6d7c201dfa80502cb6cefbee7dc9160cedb5187
Merge commit 'c6d7c201dfa80502cb6cefbee7dc9160cedb5187'

* commit 'c6d7c201dfa80502cb6cefbee7dc9160cedb5187':
  indeo3: check ff_set_dimensions return value

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