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

Merge commit '8cafeb8b' 


* commit '8cafeb8b':
  mxfdec: Validate parameters to strftime

Conflicts:
	libavformat/mxfdec.c

See: 423089e9
Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 53eb4e07 8cafeb8b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 8 additions and 3 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