[FFmpeg-cvslog] Merge commit '24e87f7f425a52b1e69661dcb2fbe0555a76f30b'

Michael Niedermayer git at videolan.org
Sun Aug 10 01:41:55 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Aug 10 01:36:21 2014 +0200| [c218d8218d95684c5e1b4c09ed0f258457f0ae7c] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c218d8218d95684c5e1b4c09ed0f258457f0ae7c
---





More information about the ffmpeg-cvslog mailing list