Merge commit '31dc73e92a96f08d07650c0e7d31c0b9a1465d46'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Feb 2015 21:39:32 +0000 (22:39 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Feb 2015 21:39:32 +0000 (22:39 +0100)
commit7a7b77e6c97aabb654414044a000e8c4e9d52575
tree947e09bb5fa85d2baaa077682facfe33f48857d9
parent3d5c0ba816b97d45ccba229ed1a0ff9d82952e1e
parent31dc73e92a96f08d07650c0e7d31c0b9a1465d46
Merge commit '31dc73e92a96f08d07650c0e7d31c0b9a1465d46'

* commit '31dc73e92a96f08d07650c0e7d31c0b9a1465d46':
  vorbisdec: Check memory allocations

Conflicts:
libavcodec/vorbisdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/vorbisdec.c