falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

Merge commit '883e98bc25755327565d8ae0f565a6c886f24816' 

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

Conflicts:
	libavformat/format.c

See: bcac0f4010
Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.5
Michael Niedermayer 11 years ago
parent
5a5d454dcc 883e98bc25
commit
b7a5538870
Split View
Diff Options
Show Stats Download Patch File Download Diff File

Diff Content Not Available