aboutsummaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-12-19 04:10:17 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-12-19 04:10:17 +0100
commit16f0618200a31e4c017ae88bf09c1e5af6c583e6 (patch)
tree5ba9d48d72ae5e91910e34fd9e12c99943eb7765 /README.md
parentbce06eb059a22fa1cd76a13112c36a4353894cca (diff)
parentae2d41ec875965ce4ab9fdd88a5e8ba57cada67a (diff)
downloadffmpeg-16f0618200a31e4c017ae88bf09c1e5af6c583e6.tar.gz
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>
Diffstat (limited to 'README.md')
0 files changed, 0 insertions, 0 deletions