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)
* commit '994ab1804b8bf532f44876927b07b51f1f63247f':
  ansi: check ff_set_dimensions return value

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

Simple merge