Merge commit '39e07ac9fcaf3d412f9a33f427072e8ded032d24' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 01:57:48 +0000 (02:57 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 01:57:48 +0000 (02:57 +0100)
* commit '39e07ac9fcaf3d412f9a33f427072e8ded032d24':
  ansi: check ff_set_dimensions return value

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

Simple merge