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

Merge commit '06cf597c' 


* commit '06cf597c':
  yop: check that extradata is large enough.

Conflicts:
	libavcodec/yop.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 769eba75 06cf597c
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