added new config.h define, WITH_STATIC_FFMPEG, to make it possible to link ffmpeg as a static library instead of dynamic.

Originally committed to SVN as r2138.
This commit is contained in:
Karl Blomster 2008-03-24 12:19:17 +00:00
parent 7be56fbcd4
commit 4e3529930d
2 changed files with 7 additions and 2 deletions

View File

@ -154,10 +154,12 @@
////////// //////////
// FFMPEG // FFMPEG
#ifdef WITH_FFMPEG #ifdef WITH_FFMPEG
#ifndef WITH_STATIC_FFMPEG
#pragma comment(lib, "avcodec-51.lib") #pragma comment(lib, "avcodec-51.lib")
#pragma comment(lib, "avformat-51.lib") #pragma comment(lib, "avformat-51.lib")
#pragma comment(lib, "avutil-49.lib") #pragma comment(lib, "avutil-49.lib")
#endif #endif
#endif
///////////// /////////////

View File

@ -130,8 +130,11 @@
// Enable FFmpeg video and audio decoders // Enable FFmpeg video and audio decoders
// Requires: libavcodec and libavformat // Requires: libavcodec, libavformat, libswscale, libavutil
//#define WITH_FFMPEG // If you compiled static libraries (yes, by default), uncomment the second line as well,
// and remember to add the correct .a files to the linker's additional dependencies.
// #define WITH_FFMPEG
// #define WITH_STATIC_FFMPEG
// Enable Ruby support for Automation // Enable Ruby support for Automation