[FFmpeg-cvslog] Merge commit '994ab1804b8bf532f44876927b07b51f1f63247f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 13 14:51:16 2014 +0100| [057b74d19c0f1493b3aff14439648a9122128f1a] | committer: Michael Niedermayer

Merge commit '994ab1804b8bf532f44876927b07b51f1f63247f'

* commit '994ab1804b8bf532f44876927b07b51f1f63247f':
  ansi: check ff_set_dimensions return value

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

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