Skip to content
Snippets Groups Projects
Commit 16f06182 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit 'ae2d41ec' 


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

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

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents bce06eb0 ae2d41ec
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment