Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Oct 2013 09:40:48 +0000 (10:40 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Oct 2013 09:41:06 +0000 (10:41 +0100)
commit7fd7a10efde79098b7ea48aaf92a6be4c6d67f82
tree0e4a608ae4098dca18cc82a42d9504d5713ad974
parent0b9e480b8f3be266acf708bbab80d53bb7f48b7d
parent4f2d8968c04ef76bb18df103a1287b864c0e6fe6
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  oggparsetheora: check av_mallocz result

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/oggparsetheora.c