[SCM] libav/experimental: Include headers for optional libraries only when enabled.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 2cd39dbf16579e6381dcb3ac962523727fe5cf4a
Author: Diego Pettenò <flameeyes at gmail.com>
Date:   Wed Oct 22 10:36:34 2008 +0000

    Include headers for optional libraries only when enabled.
    
    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

diff --git a/cmdutils.c b/cmdutils.c
index 5c6715d..f52f56e 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -24,12 +24,20 @@
 #include <errno.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 "libavformat/avformat.h"
+#ifdef CONFIG_AVFILTER
 #include "libavfilter/avfilter.h"
+#endif
 #include "libavdevice/avdevice.h"
 #include "libswscale/swscale.h"
+#ifdef CONFIG_POSTPROC
 #include "libpostproc/postprocess.h"
+#endif
 #include "libavutil/avstring.h"
 #include "libavcodec/opt.h"
 #include "cmdutils.h"

-- 
Libav/FFmpeg packaging