diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-15 21:31:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-15 21:34:06 +0100 |
| commit | fa321cc0c8edabc790bcea41ceeecb226ed8d5a5 (patch) | |
| tree | b23011721cacbc4de55bdc385ab6c65f0fac5f0e /libavcodec | |
| parent | f3b6a8f554e24e617f1428678bf5aafefc6b8fb9 (diff) | |
| parent | b4cda0a999facbddacb95861a67ff61074edc39b (diff) | |
| download | ffmpeg-fa321cc0c8edabc790bcea41ceeecb226ed8d5a5.tar.gz | |
Merge commit 'b4cda0a999facbddacb95861a67ff61074edc39b'
* commit 'b4cda0a999facbddacb95861a67ff61074edc39b':
ogg: check memory allocations
Conflicts:
libavformat/oggenc.c
See: 0f629823355680802320ee7be52af7f4e1b3e0b3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
0 files changed, 0 insertions, 0 deletions