generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '2d09b36c0379fcda8f984bc8ad8816c8326fd7bd'

Browse Source 
* 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@gmx.at>
This commit is contained in:
Michael Niedermayer
2012-10-21 16:03:31 +02:00
parent 99ea47fe5a 2d09b36c03
commit aa760b1735
5 changed files with 187 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavutil/intmath.h
View File

@@ -26,6 +26,10 @@
#include "config.h"
#include "attributes.h"
#if ARCH_ARM
# include "arm/intmath.h"
#endif
/**
* @addtogroup lavu_internal
* @{