Merge commit '8df5fbf0b0c0ba12b033e61c28fc240f4bccba47'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 31 May 2015 23:59:52 +0000 (01:59 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Jun 2015 00:00:29 +0000 (02:00 +0200)
* commit '8df5fbf0b0c0ba12b033e61c28fc240f4bccba47':
  lcl: Check memory allocation

Conflicts:
libavcodec/lclenc.c

See: 6dbcecd78e022493866fe39e30743284acc550b3
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge