Merge commit '9e0a38d32b36fac7fd73bdb93e820ae0b9e03616' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 01:59:01 +0000 (02:59 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 01:59:01 +0000 (02:59 +0100)
commit98ba2887370e228a2b9303e8d8b6b32d8a211e0c
treed8cb30cc1600e622c713b32e007f81b6956ab4aa
parentbaef2736b07dcb55d8acff945ee61e619691f1a0
parent9e0a38d32b36fac7fd73bdb93e820ae0b9e03616
Merge commit '9e0a38d32b36fac7fd73bdb93e820ae0b9e03616' into release/2.4

* commit '9e0a38d32b36fac7fd73bdb93e820ae0b9e03616':
  avs: check ff_set_dimensions return value

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