summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
m---------common0
-rw-r--r--gst/chart/gstchart.c6
-rw-r--r--gst/mpeg1sys/buffer.c8
-rw-r--r--gst/mpeg1videoparse/gstmp1videoparse.c8
-rw-r--r--gst/mpeg2sub/Makefile.am2
-rw-r--r--gst/mpeg2sub/gstmpeg2subt.c4
-rw-r--r--gst/mpegaudioparse/gstmpegaudioparse.c4
-rw-r--r--gst/playondemand/filter.func3
8 files changed, 15 insertions, 20 deletions
diff --git a/common b/common
-Subproject 38267abf56a3428093cea71429dca6a24a92754
+Subproject 6148068f2318e85d8e66df485342b630d8fb49a
diff --git a/gst/chart/gstchart.c b/gst/chart/gstchart.c
index f049c194..9474b4b1 100644
--- a/gst/chart/gstchart.c
+++ b/gst/chart/gstchart.c
@@ -247,12 +247,6 @@ gst_chart_sinkconnect (GstPad *pad, GstCaps *caps)
}
static void
-gst_chart_free (GstChart *chart)
-{
- g_free (chart);
-}
-
-static void
draw_chart_16bpp(guchar * output, gint width, gint height,
gint16 * src_data, gint src_size)
{
diff --git a/gst/mpeg1sys/buffer.c b/gst/mpeg1sys/buffer.c
index 08f72035..591d3ba5 100644
--- a/gst/mpeg1sys/buffer.c
+++ b/gst/mpeg1sys/buffer.c
@@ -58,11 +58,11 @@ static double picture_rates [16] =
0,
0
};
-
+/* deined but not used
static double ratio [16] = { 0., 1., 0.6735, 0.7031, 0.7615, 0.8055,
0.8437, 0.8935, 0.9157, 0.9815, 1.0255, 1.0695, 1.0950, 1.1575,
1.2015, 0.};
-
+*/
static char picture_types [4][3] =
{ "I", "P", "B", "D" };
@@ -82,7 +82,7 @@ static double dfrequency[9] =
{44.1, 48, 32, 22.05, 24, 16, 11.025, 12, 8};
static unsigned int samples [4] = {192, 384, 1152, 1152};
-
+/* deined but not used
static char mode [4][15] =
{ "stereo", "joint stereo", "dual channel", "single channel" };
static char copyright [2][20] =
@@ -91,7 +91,7 @@ static char original [2][10] =
{ "copy","original" };
static char emphasis [4][20] =
{ "none", "50/15 microseconds", "reserved", "CCITT J.17" };
-
+*/
static void mpeg1mux_buffer_update_video_info(Mpeg1MuxBuffer *mb);
static void mpeg1mux_buffer_update_audio_info(Mpeg1MuxBuffer *mb);
diff --git a/gst/mpeg1videoparse/gstmp1videoparse.c b/gst/mpeg1videoparse/gstmp1videoparse.c
index d56f09dc..ce4fddb6 100644
--- a/gst/mpeg1videoparse/gstmp1videoparse.c
+++ b/gst/mpeg1videoparse/gstmp1videoparse.c
@@ -94,9 +94,9 @@ static void gst_mp1videoparse_init (Mp1VideoParse *mp1videoparse);
static void gst_mp1videoparse_chain (GstPad *pad, GstBuffer *buf);
static void gst_mp1videoparse_real_chain (Mp1VideoParse *mp1videoparse, GstBuffer *buf, GstPad *outpad);
-
+/* defined but not used
static void gst_mp1videoparse_flush (Mp1VideoParse *mp1videoparse);
-
+*/
static GstPadTemplate *src_template, *sink_template;
static GstElementClass *parent_class = NULL;
@@ -203,7 +203,7 @@ mp1videoparse_find_next_gop (Mp1VideoParse *mp1videoparse, GstBuffer *buf)
return -1;
}
-
+/* defined but not used
static void
gst_mp1videoparse_flush (Mp1VideoParse *mp1videoparse)
{
@@ -216,7 +216,7 @@ gst_mp1videoparse_flush (Mp1VideoParse *mp1videoparse)
mp1videoparse->in_flush = TRUE;
mp1videoparse->picture_in_buffer = 0;
}
-
+*/
static void
gst_mp1videoparse_chain (GstPad *pad,GstBuffer *buf)
{
diff --git a/gst/mpeg2sub/Makefile.am b/gst/mpeg2sub/Makefile.am
index 876d5c53..4f78ea18 100644
--- a/gst/mpeg2sub/Makefile.am
+++ b/gst/mpeg2sub/Makefile.am
@@ -5,7 +5,7 @@ plugin_LTLIBRARIES = libgstmpeg2subt.la
libgstmpeg2subt_la_SOURCES = gstmpeg2subt.c
if HAVE_CPU_I386
-ARCHCFLAGS = -m486
+ARCHCFLAGS = -mcpu=486
else
ARCHCFLAGS =
endif
diff --git a/gst/mpeg2sub/gstmpeg2subt.c b/gst/mpeg2sub/gstmpeg2subt.c
index 4aebfa6c..f111e5aa 100644
--- a/gst/mpeg2sub/gstmpeg2subt.c
+++ b/gst/mpeg2sub/gstmpeg2subt.c
@@ -43,14 +43,14 @@ static GstElementDetails mpeg2subt_details = {
"Wim Taymans <wim.taymans@chello.be>",
"(C) 2000",
};
-
+/* defined but not used
static GstTypeDefinition mpeg2subtitledefinition = {
"mpeg2subt_video/mpeg2ubtitle",
"video/mpeg2subtitle",
NULL,
NULL,
};
-
+*/
/* GstMpeg2Subt signals and args */
enum {
/* FILL ME */
diff --git a/gst/mpegaudioparse/gstmpegaudioparse.c b/gst/mpegaudioparse/gstmpegaudioparse.c
index 65f1b279..23e632ac 100644
--- a/gst/mpegaudioparse/gstmpegaudioparse.c
+++ b/gst/mpegaudioparse/gstmpegaudioparse.c
@@ -144,10 +144,10 @@ gst_mp3parse_init (GstMPEGAudioParse *mp3parse)
mp3parse->sinkpad = gst_pad_new_from_template(sink_temp, "sink");
gst_element_add_pad(GST_ELEMENT(mp3parse),mp3parse->sinkpad);
+ gst_element_set_loop_function (GST_ELEMENT(mp3parse),gst_mp3parse_loop);
#if 1 /* set this to one to use the old chaining code */
gst_pad_set_chain_function(mp3parse->sinkpad,gst_mp3parse_chain);
-#else /* else you get the new loop-based code, which isn't complete yet */
- gst_element_set_loop_function (GST_ELEMENT(mp3parse),gst_mp3parse_loop);
+ gst_element_set_loop_function (GST_ELEMENT(mp3parse),NULL);
#endif
mp3parse->srcpad = gst_pad_new_from_template(src_temp, "src");
diff --git a/gst/playondemand/filter.func b/gst/playondemand/filter.func
index a1128e20..091626b2 100644
--- a/gst/playondemand/filter.func
+++ b/gst/playondemand/filter.func
@@ -63,7 +63,8 @@ do {
out = in;
} else {
j = 0;
-
+ w = 0;
+
out = gst_buffer_new_from_pool(filter->bufpool, 0, 0);
}