Browse Source

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  oggparsetheora: check av_mallocz result

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.2-rc1
Michael Niedermayer 12 years ago
parent
commit
7fd7a10efd
1 changed files with 2 additions and 0 deletions
  1. +2
    -0
      libavformat/oggparsetheora.c

+ 2
- 0
libavformat/oggparsetheora.c View File

@@ -50,6 +50,8 @@ static int theora_header(AVFormatContext *s, int idx)

if (!thp) {
thp = av_mallocz(sizeof(*thp));
if (!thp)
return AVERROR(ENOMEM);
os->private = thp;
}



Loading…
Cancel
Save