mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

distcheck fixes

Browse source 
Original commit message from CVS:
distcheck fixes
This commit is contained in:
David Schleef 2003-11-22 04:06:50 +00:00
parent 39ff733bb0
commit 3863b258b2
3 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gst-libs/ext/ffmpeg/Makefile.am
View file

@ -74,15 +74,6 @@ install: all
uninstall: uninstall:
@true @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 noinst_LTLIBRARIES = libavformat.la libavcodec.la
@ -168,8 +159,9 @@ libavformat_la_SOURCES = \
ffmpeg/libavformat/yuv.c ffmpeg/libavformat/yuv.c
libavformat_la_LDFLAGS = -lm -lz libavformat_la_LDFLAGS = -lm -lz
libavformat_la_CFLAGS = $(defs) -Wall -I$(srcdir)/ffmpeg -I$(srcdir)/ffmpeg/libavformat \ libavformat_la_CFLAGS = $(defs) -Wall -I$(srcdir) -I$(srcdir)/ffmpeg \
-I$(srcdir)/ffmpeg/libavcodec -DHAVE_AV_CONFIG_H \ -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 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE

6
sys/ximage/ximagesink.c
View file

@ -22,8 +22,8 @@
#endif #endif
/* Our interfaces */ /* Our interfaces */
#include <gst-libs/gst/navigation/navigation.h> #include <gst/navigation/navigation.h>
#include <gst-libs/gst/xoverlay/xoverlay.h> #include <gst/xoverlay/xoverlay.h>
/* Object header */ /* Object header */
#include "ximagesink.h" #include "ximagesink.h"
@ -543,6 +543,8 @@ gst_ximagesink_sinkconnect (GstPad *pad, GstCaps *caps)
return GST_PAD_LINK_DELAYED; return GST_PAD_LINK_DELAYED;
if (GST_CAPS_IS_CHAINED (caps)) if (GST_CAPS_IS_CHAINED (caps))
return GST_PAD_LINK_DELAYED; 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_DEBUG ("sinkconnect %s with %s", gst_caps_to_string(caps),
gst_caps_to_string(ximagesink->xcontext->caps)); gst_caps_to_string(ximagesink->xcontext->caps));

4
sys/xvimage/xvimagesink.c
View file

@ -22,8 +22,8 @@
#endif #endif
/* Our interfaces */ /* Our interfaces */
#include <gst-libs/gst/navigation/navigation.h> #include <gst/navigation/navigation.h>
#include <gst-libs/gst/xoverlay/xoverlay.h> #include <gst/xoverlay/xoverlay.h>
/* Object header */ /* Object header */
#include "xvimagesink.h" #include "xvimagesink.h"