Merge commit '6bdae41d3ef74a0865e8f87896e649f93b2f39bd'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Mar 2015 22:50:41 +0000 (23:50 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Mar 2015 22:51:44 +0000 (23:51 +0100)
commitb0112019f918b24b085395be243be91a196e73af
treec9dc68056cc0f42431d956a9df26c258c6974f76
parent9f8f2bcab6267be2054211dab9d5824af5517201
parent6bdae41d3ef74a0865e8f87896e649f93b2f39bd
Merge commit '6bdae41d3ef74a0865e8f87896e649f93b2f39bd'

* commit '6bdae41d3ef74a0865e8f87896e649f93b2f39bd':
  matroskadec: Check memory allocations

Conflicts:
libavformat/matroskadec.c

See: 3e2a5b33f0355eeb80b6b2805be7f1b4fa1d1a46
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/matroskadec.c