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

Merge commit '03eb5574' 


* commit '03eb5574':
  wmv2enc: Check memory allocation

Conflicts:
	libavcodec/wmv2enc.c

See: 6e8fe448
Merged-by: default avatarMichael Niedermayer <michael@niedermayer.cc>
parents c7074375 03eb5574
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 0 deletions
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