Commit b7a55388 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '883e98bc'

* commit '883e98bc':
  probe: Bump the score for mime type matching

Conflicts:
	libavformat/format.c

See: bcac0f40Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 5a5d454d 883e98bc
Markdown is supported
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