Commit e4de7369 authored by Erik Walthinsen's avatar Erik Walthinsen
Browse files

Merged from HEAD into INCSCHED on 200105251

Original commit message from CVS:
Merged from HEAD into INCSCHED on 200105251
parent 9b53fb17
......@@ -32,11 +32,28 @@ libtool_version=`libtool --version | sed 's/^.* \([0-9\.]*\) .*$/\1/'`
libtool_major=`echo $libtool_version | cut -d. -f1`
libtool_minor=`echo $libtool_version | cut -d. -f2`
libtool_micro=`echo $libtool_version | cut -d. -f3`
if [ $libtool_major -lt 1 -o $libtool_minor -lt 3 -o $libtool_micro -lt 5 ];then
echo
echo "You must have libtool 1.3.5 or greater to compile $package."
echo "Get the latest version from ftp://alpha.gnu.org/gnu/libtool/"
DIE=1
if [ x$libtool_micro = x ]; then
libtool_micro=0
fi
if [ $libtool_major -le 1 ]; then
if [ $libtool_major -lt 1 ]; then
echo
echo "You must have libtool 1.3.5 or greater to compile $package."
echo "Get the latest version from ftp://alpha.gnu.org/gnu/libtool/"
DIE=1
elif [ $libtool_minor -le 3 ]; then
if [ $libtool_minor -lt 3 ]; then
echo
echo "You must have libtool 1.3.5 or greater to compile $package."
echo "Get the latest version from ftp://alpha.gnu.org/gnu/libtool/"
DIE=1
elif [ $libtool_micro -lt 5 ]; then
echo
echo "You must have libtool 1.3.5 or greater to compile $package."
echo "Get the latest version from ftp://alpha.gnu.org/gnu/libtool/"
DIE=1
fi
fi
fi
if test "$DIE" -eq 1; then
......
This diff is collapsed.
......@@ -28,7 +28,7 @@
</para>
<para>
If the autoplugger supports the RENDERER API, use gst_autoplug_to_renderers() call to
create a bin that connectes the src caps to the specified render elements. You can
create a bin that connects the src caps to the specified render elements. You can
then add the bin to a pipeline and run it.
<programlisting>
......
......@@ -63,7 +63,7 @@ struct _GstFakeSinkClass {
GstElementClass parent_class;
/* signals */
void (*handoff) (GstElement *element,GstPad *pad);
void (*handoff) (GstElement *element, GstBuffer *buf, GstPad *pad);
};
GtkType gst_fakesink_get_type(void);
......
......@@ -79,7 +79,7 @@ struct _GstFakeSrcClass {
GstElementClass parent_class;
/* signals */
void (*handoff) (GstElement *element,GstPad *pad);
void (*handoff) (GstElement *element, GstBuffer *buf, GstPad *pad);
};
GtkType gst_fakesrc_get_type(void);
......
......@@ -184,7 +184,7 @@ gst_videoscale_bilinear (unsigned char *src, double x, double y, int sw, int sh)
double dest;
int color;
printf("videoscale: scaling bilinear %f %f %dx%d\n", x, y, sw, sh);
GST_DEBUG(0,"videoscale: scaling bilinear %f %f %dx%d\n", x, y, sw, sh);
dest=(1-a)*(1-b)*RC(j,k)+
a*(1-b)*RC(j+1,k);
......
......@@ -63,7 +63,7 @@ struct _GstFakeSinkClass {
GstElementClass parent_class;
/* signals */
void (*handoff) (GstElement *element,GstPad *pad);
void (*handoff) (GstElement *element, GstBuffer *buf, GstPad *pad);
};
GtkType gst_fakesink_get_type(void);
......
......@@ -79,7 +79,7 @@ struct _GstFakeSrcClass {
GstElementClass parent_class;
/* signals */
void (*handoff) (GstElement *element,GstPad *pad);
void (*handoff) (GstElement *element, GstBuffer *buf, GstPad *pad);
};
GtkType gst_fakesrc_get_type(void);
......
......@@ -34,8 +34,8 @@ main (int argc,char *argv[])
dvdec = gst_elementfactory_make ("dvdec", "decoder");
cspace = gst_elementfactory_make ("colorspace", "cspace");
//videoscale = gst_elementfactory_make ("videoscale", "videoscale");
//gtk_object_set (GTK_OBJECT (videoscale), "width", 352, "height",288, NULL);
videoscale = gst_elementfactory_make ("videoscale", "videoscale");
gtk_object_set (GTK_OBJECT (videoscale), "width", 352, "height",288, NULL);
encoder = gst_elementfactory_make ("mpeg2enc", "mpeg2enc");
fdsink = gst_elementfactory_make ("fdsink", "fdsink");
......@@ -45,13 +45,13 @@ main (int argc,char *argv[])
gst_bin_add (GST_BIN (bin), GST_ELEMENT (src));
gst_bin_add (GST_BIN (bin), GST_ELEMENT (dvdec));
gst_bin_add (GST_BIN (bin), GST_ELEMENT (cspace));
//gst_bin_add (GST_BIN (bin), GST_ELEMENT (videoscale));
gst_bin_add (GST_BIN (bin), GST_ELEMENT (videoscale));
gst_bin_add (GST_BIN (bin), GST_ELEMENT (encoder));
gst_bin_add (GST_BIN (bin), GST_ELEMENT (fdsink));
gst_element_connect (src, "src", dvdec, "sink");
gst_element_connect (cspace, "src", encoder, "sink");
//gst_element_connect (videoscale, "src", encoder, "sink");
gst_element_connect (cspace, "src", videoscale, "sink");
gst_element_connect (videoscale, "src", encoder, "sink");
gst_element_connect (encoder, "src", fdsink, "sink");
gst_element_connect (dvdec, "video", cspace, "sink");
......
......@@ -42,7 +42,7 @@ main (int argc,char *argv[])
// cspace = gst_elementfactory_make ("colorspace", "cspace");
videosink = gst_elementfactory_make ("xvideosink", "videosink");
if (!videosink) fprintf(stderr,"no dvdec\n"),exit(1);
gtk_object_set(GTK_OBJECT(videosink),"width",720,"height",480,NULL);
gtk_object_set(GTK_OBJECT(videosink),"width",720,"height",576,NULL);
gst_bin_add(GST_BIN(bin),GST_ELEMENT(src));
gst_bin_add(GST_BIN(bin),GST_ELEMENT(dvdec));
......@@ -66,7 +66,7 @@ main (int argc,char *argv[])
draw = gst_util_get_int_arg (GTK_OBJECT (videosink), "xid"),
gtk_socket = gtk_socket_new ();
gtk_widget_set_usize(gtk_socket,720,480);
gtk_widget_set_usize(gtk_socket,720,576);
gtk_widget_show (gtk_socket);
gnome_app_set_contents(GNOME_APP(appwindow), vbox1);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment