summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@ronald.bitfreak.net>2004-12-01 20:42:01 +0000
committerRonald S. Bultje <rbultje@ronald.bitfreak.net>2004-12-01 20:42:01 +0000
commitbf470fb7b3f434f07ef65d381103b881452197be (patch)
tree6a8b3827a03d546934c9c7d39d9deb31b9d95381
parent35a2c36ec4769b1cacfa188ebcebc2592cbba5f5 (diff)
downloadgst-plugins-bad-bf470fb7b3f434f07ef65d381103b881452197be.tar.gz
gst-plugins-bad-bf470fb7b3f434f07ef65d381103b881452197be.tar.bz2
gst-plugins-bad-bf470fb7b3f434f07ef65d381103b881452197be.zip
ext/esd/esdsink.c: Make error actually say something useful (fixes #156798).
Original commit message from CVS: * ext/esd/esdsink.c: (gst_esdsink_chain): Make error actually say something useful (fixes #156798). * gst-libs/gst/riff/riff-media.c: (gst_riff_create_video_caps_with_data), (gst_riff_create_video_template_caps): Add Intel Video 5.0 fourcc (IV50).
-rw-r--r--ChangeLog9
-rw-r--r--gst-libs/gst/riff/riff-media.c8
2 files changed, 17 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 64ac54f3..203f68b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-12-01 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
+
+ * ext/esd/esdsink.c: (gst_esdsink_chain):
+ Make error actually say something useful (fixes #156798).
+ * gst-libs/gst/riff/riff-media.c:
+ (gst_riff_create_video_caps_with_data),
+ (gst_riff_create_video_template_caps):
+ Add Intel Video 5.0 fourcc (IV50).
+
2004-12-01 Christophe Fergeau <teuf@gnome.org>
* ext/mad/gstmad.c: (mpg123_parse_xing_header): fix xing header
diff --git a/gst-libs/gst/riff/riff-media.c b/gst-libs/gst/riff/riff-media.c
index 9dbb31da..99aa9a03 100644
--- a/gst-libs/gst/riff/riff-media.c
+++ b/gst-libs/gst/riff/riff-media.c
@@ -297,6 +297,13 @@ gst_riff_create_video_caps_with_data (guint32 codec_fcc,
*codec_name = g_strdup ("Xan Wing Commander 4");
break;
+ case GST_MAKE_FOURCC ('I', 'V', '5', '0'):
+ caps = gst_caps_new_simple ("video/x-intel",
+ "ivversion", G_TYPE_INT, 5, NULL);
+ if (codec_name)
+ *codec_name = g_strdup ("Intel Video 5");
+ break;
+
default:
GST_WARNING ("Unknown video fourcc " GST_FOURCC_FORMAT,
GST_FOURCC_ARGS (codec_fcc));
@@ -584,6 +591,7 @@ gst_riff_create_video_template_caps (void)
GST_MAKE_FOURCC ('R', 'L', 'E', ' '),
GST_MAKE_FOURCC ('D', 'I', 'B', ' '),
GST_MAKE_FOURCC ('X', 'x', 'a', 'n'),
+ GST_MAKE_FOURCC ('I', 'V', '5', '0'),
/* FILL ME */
0
};