Merge commit 'ae2d41ec875965ce4ab9fdd88a5e8ba57cada67a'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 03:10:17 +0000 (04:10 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 03:10:17 +0000 (04:10 +0100)
commit16f0618200a31e4c017ae88bf09c1e5af6c583e6
tree5ba9d48d72ae5e91910e34fd9e12c99943eb7765
parentbce06eb059a22fa1cd76a13112c36a4353894cca
parentae2d41ec875965ce4ab9fdd88a5e8ba57cada67a
Merge commit 'ae2d41ec875965ce4ab9fdd88a5e8ba57cada67a'

* commit 'ae2d41ec875965ce4ab9fdd88a5e8ba57cada67a':
  elbg: check memory allocations and propagate errors

Conflicts:
libavcodec/elbg.c
libavcodec/elbg.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/elbg.c
libavcodec/elbg.h