Merge commit 'c7384664ba0cbb12d882effafbc6d321ae706cff'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Nov 2014 13:50:35 +0000 (14:50 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Nov 2014 13:51:03 +0000 (14:51 +0100)
* commit 'c7384664ba0cbb12d882effafbc6d321ae706cff':
  avs: check ff_set_dimensions return value

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

Simple merge