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

Merge commit '2d09b36c'


* commit '2d09b36c':
  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: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 99ea47fe 2d09b36c
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment