diff options
| author | David Schleef <ds@schleef.org> | 2003-11-10 22:47:38 +0000 |
|---|---|---|
| committer | David Schleef <ds@schleef.org> | 2003-11-10 22:47:38 +0000 |
| commit | 62d39027ae5e5325ab19c46146f0a4f226e37e1e (patch) | |
| tree | 3aea44b9099f42058c73e667c5d044c8dcd033de /gst | |
| parent | 28a38344c68672ce2dc58a1e4cfe46f8be12e916 (diff) | |
| download | gst-plugins-bad-62d39027ae5e5325ab19c46146f0a4f226e37e1e.tar.gz gst-plugins-bad-62d39027ae5e5325ab19c46146f0a4f226e37e1e.tar.bz2 gst-plugins-bad-62d39027ae5e5325ab19c46146f0a4f226e37e1e.zip | |
change video/x-jpeg to image/jpeg
Original commit message from CVS:
change video/x-jpeg to image/jpeg
Diffstat (limited to 'gst')
| -rw-r--r-- | gst/qtdemux/qtdemux.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c index 3fe04671..8c7ea70d 100644 --- a/gst/qtdemux/qtdemux.c +++ b/gst/qtdemux/qtdemux.c @@ -353,6 +353,8 @@ static void gst_qtdemux_loop_header (GstElement *element) case GST_MAKE_FOURCC('m','d','a','t'): case GST_MAKE_FOURCC('f','r','e','e'): case GST_MAKE_FOURCC('w','i','d','e'): + case GST_MAKE_FOURCC('P','I','C','T'): + case GST_MAKE_FOURCC('p','n','o','t'): break; case GST_MAKE_FOURCC('m','o','o','v'): { @@ -1520,19 +1522,19 @@ static GstCaps *qtdemux_video_caps(GstQTDemux *qtdemux, guint32 fourcc) switch(fourcc){ case GST_MAKE_FOURCC('j','p','e','g'): /* JPEG */ - return GST_CAPS_NEW("jpeg_caps","video/x-jpeg", + return GST_CAPS_NEW("jpeg_caps","image/jpeg", "framerate", GST_PROPS_FLOAT_RANGE (0, G_MAXFLOAT), "width", GST_PROPS_INT_RANGE (16, 4096), "height", GST_PROPS_INT_RANGE (16, 4096)); case GST_MAKE_FOURCC('m','j','p','a'): /* Motion-JPEG (format A) */ - return GST_CAPS_NEW("mjpa_caps","video/x-jpeg", + return GST_CAPS_NEW("mjpa_caps","image/jpeg", "framerate", GST_PROPS_FLOAT_RANGE (0, G_MAXFLOAT), "width", GST_PROPS_INT_RANGE (16, 4096), "height", GST_PROPS_INT_RANGE (16, 4096)); case GST_MAKE_FOURCC('m','j','p','b'): /* Motion-JPEG (format B) */ - return GST_CAPS_NEW("mjpb_caps","video/x-jpeg", + return GST_CAPS_NEW("mjpb_caps","image/jpeg", "framerate", GST_PROPS_FLOAT_RANGE (0, G_MAXFLOAT), "width", GST_PROPS_INT_RANGE (16, 4096), "height", GST_PROPS_INT_RANGE (16, 4096)); |