aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/arm/Makefile
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-09-27 01:35:46 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-09-27 01:35:46 +0200
commitb7a55388706b81db2e8ec0b8b093edf9deede21e (patch)
treeabe454bfa47e1b12a1dbb123c6456f97e53d921c /libavcodec/arm/Makefile
parent5a5d454dcce5add7674503f94bc2dc965f2fa111 (diff)
parent883e98bc25755327565d8ae0f565a6c886f24816 (diff)
downloadffmpeg-b7a55388706b81db2e8ec0b8b093edf9deede21e.tar.gz
Merge commit '883e98bc25755327565d8ae0f565a6c886f24816'
* commit '883e98bc25755327565d8ae0f565a6c886f24816': probe: Bump the score for mime type matching Conflicts: libavformat/format.c See: bcac0f401001e6ebb0ae2718cc42d30b2009de4b Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/Makefile')
0 files changed, 0 insertions, 0 deletions