[FFmpeg-cvslog] Merge commit 'fcb07e8b332bbd6f9558bff98ff5102c5f2d8252'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 13 11:29:04 2013 +0100| [5753e3490696bb65dc8a865a5256933f370753aa] | committer: Michael Niedermayer

Merge commit 'fcb07e8b332bbd6f9558bff98ff5102c5f2d8252'

* commit 'fcb07e8b332bbd6f9558bff98ff5102c5f2d8252':
  lavc: remove disabled FF_API_MMI cruft

Conflicts:
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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