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)
commitbaef2736b07dcb55d8acff945ee61e619691f1a0
treeb4a2e43cee426c58e252ade9ed77d6b3aff7bb82
parent65b2973a543366fe398e9f376fa0ec0bda030b0a
parent39e07ac9fcaf3d412f9a33f427072e8ded032d24
Merge commit '39e07ac9fcaf3d412f9a33f427072e8ded032d24' into release/2.4

* commit '39e07ac9fcaf3d412f9a33f427072e8ded032d24':
  ansi: check ff_set_dimensions return value

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