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)
* commit '9e0a38d32b36fac7fd73bdb93e820ae0b9e03616':
  avs: check ff_set_dimensions return value

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

Simple merge