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

Merge commit '31e558fb' 


* commit '31e558fb':
  isom: add "NO16" FourCC

Conflicts:
	libavformat/isom.c

See: 96e25073
Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 2030b3a4 31e558fb
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions 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