diff options
| author | Benjamin Otte <otte@gnome.org> | 2004-04-22 03:29:01 +0000 |
|---|---|---|
| committer | Benjamin Otte <otte@gnome.org> | 2004-04-22 03:29:01 +0000 |
| commit | 294a7f0fc962ee72a443c5b7e3e6234e68958dab (patch) | |
| tree | 807172f0fe87b73800da5dcfdf71906aaae13ab9 | |
| parent | a142f75cd93c4f8227d8caca94eaf8ca38af5bc5 (diff) | |
| download | gst-plugins-bad-294a7f0fc962ee72a443c5b7e3e6234e68958dab.tar.gz gst-plugins-bad-294a7f0fc962ee72a443c5b7e3e6234e68958dab.tar.bz2 gst-plugins-bad-294a7f0fc962ee72a443c5b7e3e6234e68958dab.zip | |
gst-libs/gst/riff/riff-media.c: mpegversion is an int
Original commit message from CVS:
* gst-libs/gst/riff/riff-media.c:
(gst_riff_create_video_caps_with_data):
mpegversion is an int
* sys/v4l/gstv4lsrc.c: (gst_v4lsrc_base_init):
don't try to create pad templates with NULL caps, use any caps
instead.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | gst-libs/gst/riff/riff-media.c | 2 |
2 files changed, 10 insertions, 1 deletions
@@ -1,3 +1,12 @@ +2004-04-22 Benjamin Otte <otte@gnome.org> + + * gst-libs/gst/riff/riff-media.c: + (gst_riff_create_video_caps_with_data): + mpegversion is an int + * sys/v4l/gstv4lsrc.c: (gst_v4lsrc_base_init): + don't try to create pad templates with NULL caps, use any caps + instead. + 2004-04-20 David Schleef <ds@schleef.org> * ext/sdl/Makefile.am: Link against libgstinterfaces, not diff --git a/gst-libs/gst/riff/riff-media.c b/gst-libs/gst/riff/riff-media.c index ad34dc7d..16723738 100644 --- a/gst-libs/gst/riff/riff-media.c +++ b/gst-libs/gst/riff/riff-media.c @@ -91,7 +91,7 @@ gst_riff_create_video_caps_with_data (guint32 codec_fcc, case GST_MAKE_FOURCC ('M', 'P', 'G', 'I'): caps = gst_caps_new_simple ("video/mpeg", "systemstream", G_TYPE_BOOLEAN, FALSE, - "mpegversion", G_TYPE_BOOLEAN, 1, NULL); + "mpegversion", G_TYPE_INT, 1, NULL); if (codec_name) *codec_name = g_strdup ("MPEG video"); break; |