Merge commit '3a19405d574a467c68b48e4b824c76617fd59de0'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Jul 2014 18:57:42 +0000 (20:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Jul 2014 18:57:42 +0000 (20:57 +0200)
commit80a3a6611fe5866163b2e64da7c492fff7874a03
treefb0d5f2036e844076f7d726ccbdaaefdd382fb7c
parent31e0b5d3cb40acd960b6f6c711557a82dc2d6c5f
parent3a19405d574a467c68b48e4b824c76617fd59de0
Merge commit '3a19405d574a467c68b48e4b824c76617fd59de0'

* commit '3a19405d574a467c68b48e4b824c76617fd59de0':
  avformat: Use the mime type information in input probe

Conflicts:
libavformat/format.c
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/avformat.h
libavformat/format.c
libavformat/version.h