distcheck fixes

Original commit message from CVS:
distcheck fixes

diff --git a/gst-libs/ext/ffmpeg/Makefile.am b/gst-libs/ext/ffmpeg/Makefile.am
index fc32593..0a7a076 100644 (file)
--- a/gst-libs/ext/ffmpeg/Makefile.am
+++ b/gst-libs/ext/ffmpeg/Makefile.am
@@ -74,15 +74,6 @@ install: all
 uninstall:
        @true
 
-# override recursive targets
-# FIXME: maybe this can be prettier, so it doesn't generate warnings
-dvi-recursive:
-       true
-check-recursive:
-       true
-installcheck-recursive:
-       true
-
 
 
 noinst_LTLIBRARIES = libavformat.la libavcodec.la
@@ -168,8 +159,9 @@ libavformat_la_SOURCES = \
        ffmpeg/libavformat/yuv.c
 
 libavformat_la_LDFLAGS = -lm -lz
-libavformat_la_CFLAGS = $(defs) -Wall -I$(srcdir)/ffmpeg -I$(srcdir)/ffmpeg/libavformat \
-       -I$(srcdir)/ffmpeg/libavcodec -DHAVE_AV_CONFIG_H \
+libavformat_la_CFLAGS = $(defs) -Wall -I$(srcdir) -I$(srcdir)/ffmpeg \
+       -I$(srcdir)/ffmpeg/libavformat -I$(srcdir)/ffmpeg/libavcodec \
+       -I$(top_srcdir)/gst-libs/ext/linux/ -DHAVE_AV_CONFIG_H \
        -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
 
 

diff --git a/sys/ximage/ximagesink.c b/sys/ximage/ximagesink.c
index cf64d53..c95ca07 100644 (file)
--- a/sys/ximage/ximagesink.c
+++ b/sys/ximage/ximagesink.c
@@ -22,8 +22,8 @@
 #endif
 
 /* Our interfaces */
-#include <gst-libs/gst/navigation/navigation.h>
-#include <gst-libs/gst/xoverlay/xoverlay.h>
+#include <gst/navigation/navigation.h>
+#include <gst/xoverlay/xoverlay.h>
 
 /* Object header */
 #include "ximagesink.h"
@@ -543,6 +543,8 @@ gst_ximagesink_sinkconnect (GstPad *pad, GstCaps *caps)
     return GST_PAD_LINK_DELAYED;
   if (GST_CAPS_IS_CHAINED (caps))
     return GST_PAD_LINK_DELAYED;
+  if (!ximagesink->xcontext)
+    return GST_PAD_LINK_DELAYED;
   
   GST_DEBUG ("sinkconnect %s with %s", gst_caps_to_string(caps),
              gst_caps_to_string(ximagesink->xcontext->caps));

diff --git a/sys/xvimage/xvimagesink.c b/sys/xvimage/xvimagesink.c
index 5691645..6e94747 100644 (file)
--- a/sys/xvimage/xvimagesink.c
+++ b/sys/xvimage/xvimagesink.c
@@ -22,8 +22,8 @@
 #endif
 
 /* Our interfaces */
-#include <gst-libs/gst/navigation/navigation.h>
-#include <gst-libs/gst/xoverlay/xoverlay.h>
+#include <gst/navigation/navigation.h>
+#include <gst/xoverlay/xoverlay.h>
 
 /* Object header */
 #include "xvimagesink.h"