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

Merge commit 'de2e5777' 


* commit 'de2e5777':
  4xm: validate the buffer size before parsing it

Conflicts:
	libavcodec/4xm.c

See: 9c661e95

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents f13f4d2b de2e5777
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 16 additions and 10 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