diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-31 11:31:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-31 11:31:19 +0200 |
| commit | f8201cc18b30ae0126376d4e8ea583ef6af0c0d4 (patch) | |
| tree | c83e498225265d89091042b2b13689f6b3cd1f24 /doc/platform.texi | |
| parent | 29667a2c2014a54cf05f8106c45ad78be5228fd0 (diff) | |
| parent | f2f57d16795efa8083acef17c640bea6c08aa638 (diff) | |
| download | ffmpeg-f8201cc18b30ae0126376d4e8ea583ef6af0c0d4.tar.gz | |
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: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/platform.texi')
| -rw-r--r-- | doc/platform.texi | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/doc/platform.texi b/doc/platform.texi index bb8e6ca5ca..07030001a9 100644 --- a/doc/platform.texi +++ b/doc/platform.texi @@ -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 @code{Multi-threaded (/MT)} in your project's settings. -FFmpeg headers do not declare global data for Windows DLLs through the usual -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: +You will need to define @code{inline} to something MSVC understands: @example #define inline __inline @end example |