Merge commit '24e87f7f425a52b1e69661dcb2fbe0555a76f30b'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Aug 2014 23:36:21 +0000 (01:36 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Aug 2014 23:36:21 +0000 (01:36 +0200)
commitc218d8218d95684c5e1b4c09ed0f258457f0ae7c
treee6595772cb2eb12b746a945a9d5a5ccd40982c87
parent0f7ca2d77893c87d3c6e008520f6b5549f410387
parent24e87f7f425a52b1e69661dcb2fbe0555a76f30b
Merge commit '24e87f7f425a52b1e69661dcb2fbe0555a76f30b'

* commit '24e87f7f425a52b1e69661dcb2fbe0555a76f30b':
  Remove obsolete FF_API_PROBE_MIME cruft.

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

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