-
Michael Niedermayer authored
* commit 'ae2d41ec': elbg: check memory allocations and propagate errors Conflicts: libavcodec/elbg.c libavcodec/elbg.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
16f06182
* commit 'ae2d41ec': elbg: check memory allocations and propagate errors Conflicts: libavcodec/elbg.c libavcodec/elbg.h Merged-by: Michael Niedermayer <michaelni@gmx.at>