summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@ronald.bitfreak.net>2004-01-09 09:48:43 +0000
committerRonald S. Bultje <rbultje@ronald.bitfreak.net>2004-01-09 09:48:43 +0000
commitb5c817cb14237c402684c24010875350b8edde09 (patch)
treed87b037ba211f7565ad1e41c7f2d2515a0814c20
parentd29c7c8c08c62e6a104a7a5b436368426db25d93 (diff)
downloadgst-plugins-bad-b5c817cb14237c402684c24010875350b8edde09.tar.gz
gst-plugins-bad-b5c817cb14237c402684c24010875350b8edde09.tar.bz2
gst-plugins-bad-b5c817cb14237c402684c24010875350b8edde09.zip
ext/divx/gstdivxenc.c: Use explicit caps - fix capsnego.
Original commit message from CVS: 2004-01-09 Ronald Bultje <rbultje@ronald.bitfreak.net> * ext/divx/gstdivxenc.c: (gst_divxenc_init): Use explicit caps - fix capsnego. * ext/xvid/gstxviddec.c: * ext/xvid/gstxvidenc.c: Remove macro-inside-macro which caused compile errors. * gst-libs/gst/riff/riff-read.c: (gst_riff_read_header): Error out if it's not a RIFF file. Else we error out without gst_element_error() which is not good...
-rw-r--r--ChangeLog11
-rw-r--r--ext/divx/gstdivxenc.c3
-rw-r--r--ext/xvid/gstxviddec.c2
-rw-r--r--ext/xvid/gstxvidenc.c2
-rw-r--r--gst-libs/gst/riff/riff-read.c3
5 files changed, 15 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 26471e55..7f56b608 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-01-09 Ronald Bultje <rbultje@ronald.bitfreak.net>
+
+ * ext/divx/gstdivxenc.c: (gst_divxenc_init):
+ Use explicit caps - fix capsnego.
+ * ext/xvid/gstxviddec.c:
+ * ext/xvid/gstxvidenc.c:
+ Remove macro-inside-macro which caused compile errors.
+ * gst-libs/gst/riff/riff-read.c: (gst_riff_read_header):
+ Error out if it's not a RIFF file. Else we error out without
+ gst_element_error() which is not good...
+
2004-01-08 David Schleef <ds@schleef.org>
* ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_connect):
diff --git a/ext/divx/gstdivxenc.c b/ext/divx/gstdivxenc.c
index ea9c56f4..b7ac747d 100644
--- a/ext/divx/gstdivxenc.c
+++ b/ext/divx/gstdivxenc.c
@@ -232,6 +232,7 @@ gst_divxenc_init (GstDivxEnc *divxenc)
divxenc->srcpad = gst_pad_new_from_template(
gst_static_pad_template_get (&src_template),
"src");
+ gst_pad_use_explicit_caps (divxenc->srcpad);
gst_element_add_pad(GST_ELEMENT(divxenc), divxenc->srcpad);
/* bitrate, etc. */
@@ -456,7 +457,7 @@ gst_divxenc_connect (GstPad *pad,
"framerate", G_TYPE_DOUBLE, fps,
NULL);
- ret = gst_pad_try_set_caps(divxenc->srcpad, new_caps);
+ ret = gst_pad_set_explicit_caps (divxenc->srcpad, new_caps);
if (ret <= 0) {
gst_divxenc_unset(divxenc);
}
diff --git a/ext/xvid/gstxviddec.c b/ext/xvid/gstxviddec.c
index 68804f8c..82655f1f 100644
--- a/ext/xvid/gstxviddec.c
+++ b/ext/xvid/gstxviddec.c
@@ -55,9 +55,7 @@ GST_STATIC_PAD_TEMPLATE (
GST_PAD_ALWAYS,
GST_STATIC_CAPS (
GST_VIDEO_YUV_PAD_TEMPLATE_CAPS ("{ I420, YUY2, YV12, YVYU, UYVY }") "; "
-#ifdef XVID_CSP_ARGB
RGB_24_32_STATIC_CAPS (32, 0x00ff0000, 0x0000ff00, 0x000000ff) "; "
-#endif
RGB_24_32_STATIC_CAPS (32, 0xff000000, 0x00ff0000, 0x0000ff00) "; "
RGB_24_32_STATIC_CAPS (32, 0x0000ff00, 0x00ff0000, 0xff000000) "; "
RGB_24_32_STATIC_CAPS (32, 0x000000ff, 0x0000ff00, 0x00ff0000) "; "
diff --git a/ext/xvid/gstxvidenc.c b/ext/xvid/gstxvidenc.c
index 9ff4dd86..72ec9d78 100644
--- a/ext/xvid/gstxvidenc.c
+++ b/ext/xvid/gstxvidenc.c
@@ -43,9 +43,7 @@ GST_STATIC_PAD_TEMPLATE (
GST_PAD_ALWAYS,
GST_STATIC_CAPS (
GST_VIDEO_YUV_PAD_TEMPLATE_CAPS ("{ I420, YUY2, YV12, YVYU, UYVY }") "; "
-#ifdef XVID_CSP_ARGB
RGB_24_32_STATIC_CAPS (32, 0x00ff0000, 0x0000ff00, 0x000000ff) "; "
-#endif
RGB_24_32_STATIC_CAPS (32, 0xff000000, 0x00ff0000, 0x0000ff00) "; "
RGB_24_32_STATIC_CAPS (32, 0x0000ff00, 0x00ff0000, 0xff000000) "; "
RGB_24_32_STATIC_CAPS (32, 0x000000ff, 0x0000ff00, 0x00ff0000) "; "
diff --git a/gst-libs/gst/riff/riff-read.c b/gst-libs/gst/riff/riff-read.c
index 815b3a7b..ca09a526 100644
--- a/gst-libs/gst/riff/riff-read.c
+++ b/gst-libs/gst/riff/riff-read.c
@@ -845,7 +845,8 @@ gst_riff_read_header (GstRiffRead *riff,
if (!gst_riff_peek_head (riff, &tag, &length, NULL))
return FALSE;
if (tag != GST_RIFF_TAG_RIFF) {
- GST_WARNING ("Not a RIFF file");
+ gst_element_error (GST_ELEMENT (riff),
+ "Not a RIFF file");
return FALSE;
}
gst_bytestream_flush_fast (riff->bs, 8);