virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Include headers for optional libraries only when enabled.

Browse Source 
Include the headers for libavfilter, libswscale and libpostproc when
they are enabled (and thus linked in).

Without this change, Sun Studio will fail to link FFmpeg since two
inline functions defined in avfilter.h will have undefined references
to non-inline libavfilter functions.

Originally committed as revision 15665 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Pettenò 2008-10-22 10:36:34 +00:00
parent e3cc7d6fef
commit 2cd39dbf16
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmdutils.c
View File

@ -24,12 +24,20 @@
#include <errno.h> #include <errno.h>
#include <math.h> #include <math.h>
/* Include only the enabled headers since some compilers (namely, Sun
Studio) will not omit unused inline functions and create undefined
references to libraries that are not being built. */
#include "config.h" #include "config.h"
#include "libavformat/avformat.h" #include "libavformat/avformat.h"
#ifdef CONFIG_AVFILTER
#include "libavfilter/avfilter.h" #include "libavfilter/avfilter.h"
#endif
#include "libavdevice/avdevice.h" #include "libavdevice/avdevice.h"
#include "libswscale/swscale.h" #include "libswscale/swscale.h"
#ifdef CONFIG_POSTPROC
#include "libpostproc/postprocess.h" #include "libpostproc/postprocess.h"
#endif
#include "libavutil/avstring.h" #include "libavutil/avstring.h"
#include "libavcodec/opt.h" #include "libavcodec/opt.h"
#include "cmdutils.h" #include "cmdutils.h"