Skip to content
Snippets Groups Projects
Commit c218d821 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit '24e87f7f' 


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

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

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 0f7ca2d7 24e87f7f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment