[FFmpeg-cvslog] Merge commit '2d09b36c0379fcda8f984bc8ad8816c8326fd7bd'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Oct 21 16:03:31 2012 +0200| [aa760b1735907d256758ee67daa64f1e3b09bf0c] | committer: Michael Niedermayer

Merge commit '2d09b36c0379fcda8f984bc8ad8816c8326fd7bd'

* commit '2d09b36c0379fcda8f984bc8ad8816c8326fd7bd':
  doc/platform: Add info on shared builds with MSVC
  doc/platform: Move a caveat down to the notes section
  ARM: reinstate optimised intmath.h
  ffv1: update to ffv1 version 3

Conflicts:
	doc/platform.texi
	libavcodec/ffv1.c
	libavcodec/ffv1.h
	libavcodec/ffv1dec.c
	libavcodec/ffv1enc.c

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

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