[FFmpeg-cvslog] Merge commit 'c6d7c201dfa80502cb6cefbee7dc9160cedb5187'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 13 14:29:26 2014 +0100| [dfa0800c414a66ceebf394bb6d4208cd68673e4c] | committer: Michael Niedermayer

Merge commit 'c6d7c201dfa80502cb6cefbee7dc9160cedb5187'

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

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

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