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

Merge commit 'ad0560fe' 


* commit 'ad0560fe':
  mxf: Remove a typo

Conflicts:
	libavformat/mxfdec.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 8aa6ffd8 ad0560fe
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