Merge commit '994ab1804b8bf532f44876927b07b51f1f63247f'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Nov 2014 13:51:16 +0000 (14:51 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Nov 2014 13:51:37 +0000 (14:51 +0100)
commit057b74d19c0f1493b3aff14439648a9122128f1a
tree5bceeb9f889df2adc208e2b508022a1bb6ad0d8b
parent04f6a5230db8e3f86ec7137f87eb68c8b3ce9959
parent994ab1804b8bf532f44876927b07b51f1f63247f
Merge commit '994ab1804b8bf532f44876927b07b51f1f63247f'

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

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