diff options
| author | David Schleef <ds@schleef.org> | 2004-04-13 23:25:19 +0000 |
|---|---|---|
| committer | David Schleef <ds@schleef.org> | 2004-04-13 23:25:19 +0000 |
| commit | 9414aca1c59e27c5fe7c62eef8c53f6e06b7e630 (patch) | |
| tree | 1b691f5e2ec7aa0b384b54b21b121a4f412a3471 /gst/avi/gstavimux.c | |
| parent | 23222fefd280a46617c5d1ce47271a35d880036f (diff) | |
common/m4/gst-feature.m4: Call -config scripts with
Original commit message from CVS:
* common/m4/gst-feature.m4: Call -config scripts with
--plugin-libs if it is supported.
* gst/avi/gstavimux.c: (gst_avimux_vidsinkconnect): sequences of
JPEG images are image/jpeg.
* gst/debug/Makefile.am:
* gst/debug/negotiation.c: (gst_negotiation_class_init),
(gst_negotiation_getcaps), (gst_negotiation_pad_link),
(gst_negotiation_update_caps), (gst_negotiation_get_property),
(gst_negotiation_plugin_init): Add a property that acts like
filter caps.
* testsuite/gst-lint: Move license checking to be a standard
test.
Diffstat (limited to 'gst/avi/gstavimux.c')
| -rw-r--r-- | gst/avi/gstavimux.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c index d613d0cc..f90ec53a 100644 --- a/gst/avi/gstavimux.c +++ b/gst/avi/gstavimux.c @@ -71,7 +71,7 @@ static GstStaticPadTemplate video_sink_factory = "format = (fourcc) { YUY2, I420 }, " "width = (int) [ 16, 4096 ], " "height = (int) [ 16, 4096 ]; " - "video/x-jpeg, " + "image/jpeg, " "width = (int) [ 16, 4096 ], " "height = (int) [ 16, 4096 ]; " "video/x-divx, " @@ -317,7 +317,7 @@ gst_avimux_vidsinkconnect (GstPad * pad, const GstCaps * vscaps) /* find format */ if (!strcmp (mimetype, "video/x-huffyuv")) { avimux->vids.compression = GST_MAKE_FOURCC ('H', 'F', 'Y', 'U'); - } else if (!strcmp (mimetype, "video/x-jpeg")) { + } else if (!strcmp (mimetype, "image/jpeg")) { avimux->vids.compression = GST_MAKE_FOURCC ('M', 'J', 'P', 'G'); } else if (!strcmp (mimetype, "video/x-divx")) { gint divxversion; |