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

Merge commit '0f678c02' 


* commit '0f678c02':
  aic: Validate values read from the bitstream

Conflicts:
	libavcodec/aic.c

See: 657875b1
Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 83d2b7e9 0f678c02
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 2 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