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)
* qatar/master:
  oggparsetheora: check av_mallocz result

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

Simple merge