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

Merge commit 'e2e07dba'


* commit 'e2e07dba':
  mov: expand the list of parsed metadata tags

Conflicts:
	libavformat/mov.c

See: 543f3db9
See: dadf668d
Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 4acc717a e2e07dba
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment