mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-29 02:28:27 +00:00
More compilation fixes from my latest commit
Original commit message from CVS: More compilation fixes from my latest commit
This commit is contained in:
parent
d1c36f17ef
commit
1a7650c94b
1 changed files with 3 additions and 3 deletions
|
@ -168,7 +168,7 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
|
||||||
));
|
));
|
||||||
caps = gst_caps_append(caps,
|
caps = gst_caps_append(caps,
|
||||||
GST_FF_VID_CAPS_NEW ("ffmpeg_3ivx",
|
GST_FF_VID_CAPS_NEW ("ffmpeg_3ivx",
|
||||||
"video/x-3ivx",
|
"video/x-3ivx"
|
||||||
));
|
));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -329,7 +329,7 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
|
||||||
|
|
||||||
case CODEC_ID_4XM:
|
case CODEC_ID_4XM:
|
||||||
caps = GST_FF_VID_CAPS_NEW ("ffmpeg_4xmvideo",
|
caps = GST_FF_VID_CAPS_NEW ("ffmpeg_4xmvideo",
|
||||||
"video/x-4xm",
|
"video/x-4xm"
|
||||||
);
|
);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -945,7 +945,7 @@ gst_ffmpeg_caps_to_codecid (GstCaps *caps,
|
||||||
guint32 fmt_fcc = 0;
|
guint32 fmt_fcc = 0;
|
||||||
enum PixelFormat pix_fmt = -1;
|
enum PixelFormat pix_fmt = -1;
|
||||||
|
|
||||||
if (gst_caps_has_property)
|
if (gst_caps_has_property (caps, "format"))
|
||||||
gst_caps_get_fourcc_int (caps, "format", &fmt_fcc);
|
gst_caps_get_fourcc_int (caps, "format", &fmt_fcc);
|
||||||
else
|
else
|
||||||
fmt_fcc = GST_MAKE_FOURCC ('R','G','B',' ');
|
fmt_fcc = GST_MAKE_FOURCC ('R','G','B',' ');
|
||||||
|
|
Loading…
Reference in a new issue