OSDN Git Service

Merge commit 'b4cda0a999facbddacb95861a67ff61074edc39b'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 15 Feb 2015 20:31:13 +0000 (21:31 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 15 Feb 2015 20:34:06 +0000 (21:34 +0100)
commitfa321cc0c8edabc790bcea41ceeecb226ed8d5a5
treeb23011721cacbc4de55bdc385ab6c65f0fac5f0e
parentf3b6a8f554e24e617f1428678bf5aafefc6b8fb9
parentb4cda0a999facbddacb95861a67ff61074edc39b
Merge commit 'b4cda0a999facbddacb95861a67ff61074edc39b'

* commit 'b4cda0a999facbddacb95861a67ff61074edc39b':
  ogg: check memory allocations

Conflicts:
libavformat/oggenc.c

See: 0f629823355680802320ee7be52af7f4e1b3e0b3
Merged-by: Michael Niedermayer <michaelni@gmx.at>