mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 17:50:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

fix for caps api changes

Browse source
This commit is contained in:
Wim Taymans 2012-03-11 19:07:31 +01:00
parent ecbbbe7fd2
commit bd13c104c2
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ext/ffmpeg/gstffmpegenc.c
View file

@ -315,7 +315,7 @@ gst_ffmpegenc_finalize (GObject * object)
static GstCaps * static GstCaps *
gst_ffmpegenc_get_possible_sizes (GstFFMpegEnc * ffmpegenc, GstPad * pad, gst_ffmpegenc_get_possible_sizes (GstFFMpegEnc * ffmpegenc, GstPad * pad,
const GstCaps * caps) GstCaps * caps)
{ {
GstCaps *othercaps = NULL; GstCaps *othercaps = NULL;
GstCaps *tmpcaps = NULL; GstCaps *tmpcaps = NULL;
@ -357,7 +357,8 @@ gst_ffmpegenc_get_possible_sizes (GstFFMpegEnc * ffmpegenc, GstPad * pad,
gst_structure_set_value (tmps, "height", height); gst_structure_set_value (tmps, "height", height);
if (framerate) if (framerate)
gst_structure_set_value (tmps, "framerate", framerate); gst_structure_set_value (tmps, "framerate", framerate);
gst_caps_merge_structure (tmpcaps, tmps);
tmpcaps = gst_caps_merge_structure (tmpcaps, tmps);
} }
gst_caps_unref (intersect); gst_caps_unref (intersect);

4
ext/libswscale/gstffmpegscale.c
View file

@ -311,14 +311,14 @@ gst_ffmpegscale_transform_caps (GstBaseTransform * trans,
"width", GST_TYPE_INT_RANGE, 1, G_MAXINT, "width", GST_TYPE_INT_RANGE, 1, G_MAXINT,
"height", GST_TYPE_INT_RANGE, 1, G_MAXINT, NULL); "height", GST_TYPE_INT_RANGE, 1, G_MAXINT, NULL);
gst_caps_merge_structure (ret, gst_structure_copy (structure)); ret = gst_caps_merge_structure (ret, gst_structure_copy (structure));
/* if pixel aspect ratio, make a range of it */ /* if pixel aspect ratio, make a range of it */
if ((par = gst_structure_get_value (structure, "pixel-aspect-ratio"))) { if ((par = gst_structure_get_value (structure, "pixel-aspect-ratio"))) {
gst_structure_set (structure, gst_structure_set (structure,
"pixel-aspect-ratio", GST_TYPE_FRACTION_RANGE, 0, 1, G_MAXINT, 1, NULL); "pixel-aspect-ratio", GST_TYPE_FRACTION_RANGE, 0, 1, G_MAXINT, 1, NULL);
gst_caps_merge_structure (ret, structure); ret = gst_caps_merge_structure (ret, structure);
} else { } else {
gst_structure_free (structure); gst_structure_free (structure);
} }