change video/x-jpeg to image/jpeg
Original commit message from CVS: change video/x-jpeg to image/jpeg
This commit is contained in:
parent
ea4a82a5ad
commit
e9b809fdba
@ -86,7 +86,7 @@ jpeg_caps_factory (void)
|
|||||||
return
|
return
|
||||||
gst_caps_new (
|
gst_caps_new (
|
||||||
"jpeg_jpeg",
|
"jpeg_jpeg",
|
||||||
"video/x-jpeg",
|
"image/jpeg",
|
||||||
gst_props_new (
|
gst_props_new (
|
||||||
"width", GST_PROPS_INT_RANGE (16, 4096),
|
"width", GST_PROPS_INT_RANGE (16, 4096),
|
||||||
"height", GST_PROPS_INT_RANGE (16, 4096),
|
"height", GST_PROPS_INT_RANGE (16, 4096),
|
||||||
|
@ -353,6 +353,8 @@ static void gst_qtdemux_loop_header (GstElement *element)
|
|||||||
case GST_MAKE_FOURCC('m','d','a','t'):
|
case GST_MAKE_FOURCC('m','d','a','t'):
|
||||||
case GST_MAKE_FOURCC('f','r','e','e'):
|
case GST_MAKE_FOURCC('f','r','e','e'):
|
||||||
case GST_MAKE_FOURCC('w','i','d','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;
|
break;
|
||||||
case GST_MAKE_FOURCC('m','o','o','v'):
|
case GST_MAKE_FOURCC('m','o','o','v'):
|
||||||
{
|
{
|
||||||
@ -1520,19 +1522,19 @@ static GstCaps *qtdemux_video_caps(GstQTDemux *qtdemux, guint32 fourcc)
|
|||||||
switch(fourcc){
|
switch(fourcc){
|
||||||
case GST_MAKE_FOURCC('j','p','e','g'):
|
case GST_MAKE_FOURCC('j','p','e','g'):
|
||||||
/* JPEG */
|
/* 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),
|
"framerate", GST_PROPS_FLOAT_RANGE (0, G_MAXFLOAT),
|
||||||
"width", GST_PROPS_INT_RANGE (16, 4096),
|
"width", GST_PROPS_INT_RANGE (16, 4096),
|
||||||
"height", GST_PROPS_INT_RANGE (16, 4096));
|
"height", GST_PROPS_INT_RANGE (16, 4096));
|
||||||
case GST_MAKE_FOURCC('m','j','p','a'):
|
case GST_MAKE_FOURCC('m','j','p','a'):
|
||||||
/* Motion-JPEG (format 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),
|
"framerate", GST_PROPS_FLOAT_RANGE (0, G_MAXFLOAT),
|
||||||
"width", GST_PROPS_INT_RANGE (16, 4096),
|
"width", GST_PROPS_INT_RANGE (16, 4096),
|
||||||
"height", GST_PROPS_INT_RANGE (16, 4096));
|
"height", GST_PROPS_INT_RANGE (16, 4096));
|
||||||
case GST_MAKE_FOURCC('m','j','p','b'):
|
case GST_MAKE_FOURCC('m','j','p','b'):
|
||||||
/* Motion-JPEG (format 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),
|
"framerate", GST_PROPS_FLOAT_RANGE (0, G_MAXFLOAT),
|
||||||
"width", GST_PROPS_INT_RANGE (16, 4096),
|
"width", GST_PROPS_INT_RANGE (16, 4096),
|
||||||
"height", GST_PROPS_INT_RANGE (16, 4096));
|
"height", GST_PROPS_INT_RANGE (16, 4096));
|
||||||
|
Loading…
x
Reference in New Issue
Block a user