Merge commit '41658bc88553dab8499e4dfca311559dcbae2674'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Jun 2015 00:10:30 +0000 (02:10 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Jun 2015 00:10:47 +0000 (02:10 +0200)
commitfb7b5dc0e6146e21e67a1de0c32567e69edb33a6
tree62b14529d40d3480b6acf4e24c917525eea24911
parent3377f6fd15d7de5f574bf531c89b9670e52dc867
parent41658bc88553dab8499e4dfca311559dcbae2674
Merge commit '41658bc88553dab8499e4dfca311559dcbae2674'

* commit '41658bc88553dab8499e4dfca311559dcbae2674':
  libtheora: Check memory allocation

Conflicts:
libavcodec/libtheoraenc.c

See: 67d4d5f5db060fece8cc8e925f18f0a1c48813c6
See: 27216bf314c62125c408be1a5a79e5c9dba88e76
Merged-by: Michael Niedermayer <michaelni@gmx.at>