Commit f8201cc1 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doc/platform: Remove part about dllimport
  vp8: Fix pthread_cond and pthread_mutex leaks

Conflicts:
	doc/platform.texi
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 29667a2c f2f57d16
...@@ -184,16 +184,7 @@ If you plan to link with MSVC-built static libraries, you will need ...@@ -184,16 +184,7 @@ If you plan to link with MSVC-built static libraries, you will need
to make sure you have @code{Runtime Library} set to to make sure you have @code{Runtime Library} set to
@code{Multi-threaded (/MT)} in your project's settings. @code{Multi-threaded (/MT)} in your project's settings.
FFmpeg headers do not declare global data for Windows DLLs through the usual You will need to define @code{inline} to something MSVC understands:
dllexport/dllimport interface. Such data will be exported properly while
building, but to use them in your MSVC code you will have to edit the
appropriate headers and mark the data as dllimport. For example, in
libavutil/pixdesc.h you should have:
@example
extern __declspec(dllimport) const AVPixFmtDescriptor av_pix_fmt_descriptors[];
@end example
You will also need to define @code{inline} to something MSVC understands:
@example @example
#define inline __inline #define inline __inline
@end example @end example
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment