Changeset 1873 for trunk/src/core

Timestamp:

Aug 24, 2010, 2:29:21 AM (14 years ago)

Author:

dkearney

Message:

adding video viewing widget. this requires ffmpeg and libav* friends. if the libs are not available, the widget won't be built

Location:

trunk/src/core

Files:

• Makefile.in (modified) (2 diffs)
• config.h.in (modified) (6 diffs)

trunk/src/core/Makefile.in

@@ -79 +79 @@
                 rappture.h
 
+LOCAL_HEADERS = \
+                config.h
 
 SCEW_HEADERS    = \
@@ -181 +183 @@
           $(INSTALL) -m 444  $(srcdir)/$$i $(incdir) ; \
         done
+        for i in $(LOCAL_HEADERS) ; do \
+          $(INSTALL) -m 444  $$i $(incdir) ; \
+        done
 
 .cc.o:

trunk/src/core/config.h.in

@@ -3 +3 @@
 /* Define if building universal (internal helper macro) */
 #undef AC_APPLE_UNIVERSAL_BUILD
+
+/* Build rappture with ffmpeg widgets */
+#undef BUILD_with_ffmpeg
 
 /* Define to 1 if you have the <algorithm> header file. */
@@ -34 +37 @@
 #undef HAVE_ERRNO_H
 
+/* Define to 1 if you have the <ffmpeg/avcodec.h> header file. */
+#undef HAVE_FFMPEG_AVCODEC_H
+
+/* Define to 1 if you have the <ffmpeg/avformat.h> header file. */
+#undef HAVE_FFMPEG_AVFORMAT_H
+
+/* Define to 1 if you have the <ffmpeg/avutil.h> header file. */
+#undef HAVE_FFMPEG_AVUTIL_H
+
+/* Define to 1 if you have the <ffmpeg/swscale.h> header file. */
+#undef HAVE_FFMPEG_SWSCALE_H
+
 /* Define to 1 if you have the <float.h> header file. */
 #undef HAVE_FLOAT_H
@@ -39 +54 @@
 /* Define to 1 if you have the <fstream> header file. */
 #undef HAVE_FSTREAM
+
+/* Define to 1 if you have the `img_convert' function. */
+#undef HAVE_IMG_CONVERT
 
 /* Define to 1 if you have the <inttypes.h> header file. */
@@ -49 +67 @@
 #undef HAVE_ITERATOR
 
+/* Define to 1 if you have the <libavcodec/avcodec.h> header file. */
+#undef HAVE_LIBAVCODEC_AVCODEC_H
+
+/* Define to 1 if you have the <libavformat/avformat.h> header file. */
+#undef HAVE_LIBAVFORMAT_AVFORMAT_H
+
+/* Define to 1 if you have the <libavutil/avutil.h> header file. */
+#undef HAVE_LIBAVUTIL_AVUTIL_H
+
 /* Define to 1 if you have the `m' library (-lm). */
 #undef HAVE_LIBM
@@ -54 +81 @@
 /* Define to 1 if you have the `stdc++' library (-lstdc++). */
 #undef HAVE_LIBSTDC__
+
+/* Define to 1 if you have the <libswscale/swscale.h> header file. */
+#undef HAVE_LIBSWSCALE_SWSCALE_H
 
 /* Define to 1 if you have the <limits.h> header file. */
@@ -93 +123 @@
 /* Define to 1 if you have the <string.h> header file. */
 #undef HAVE_STRING_H
+
+/* Define to 1 if you have the `sws_scale' function. */
+#undef HAVE_SWS_SCALE
 
 /* Define to 1 if you have the `sysinfo' function. */