Merge commit '883e98bc25755327565d8ae0f565a6c886f24816'

Browse Source

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

Conflicts:
	libavformat/format.c

See: bcac0f4010
Merged-by: Michael Niedermayer <michaelni@gmx.at>

...

This commit is contained in:

Michael Niedermayer

2014-09-27 01:35:46 +02:00

parent 5a5d454dcc 883e98bc25

commit b7a5538870

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available