Merge commit '28fb80dcbf6f63eedfcfffc725a6bf0069d03fab'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Jun 2015 00:37:30 +0000 (02:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Jun 2015 00:38:06 +0000 (02:38 +0200)
* commit '28fb80dcbf6f63eedfcfffc725a6bf0069d03fab':
  svq1: Check memory allocation

Conflicts:
libavcodec/svq1enc.c

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

Simple merge