Merge commit '8df5fbf0b0c0ba12b033e61c28fc240f4bccba47'
* commit '8df5fbf0b0c0ba12b033e61c28fc240f4bccba47': lcl: Check memory allocation Conflicts: libavcodec/lclenc.c See: 6dbcecd78e022493866fe39e30743284acc550b3 Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
3377f6fd15