diff options
| author | Jan Schmidt <thaytan@mad.scientist.com> | 2005-11-23 14:22:18 +0000 |
|---|---|---|
| committer | Jan Schmidt <thaytan@mad.scientist.com> | 2005-11-23 14:22:18 +0000 |
| commit | 48520a455d828b4a6885fb37be48ebb720ae259b (patch) | |
| tree | d21e343e86c582cd830da7f810023c021cfa4c89 /ext | |
| parent | 74dc53a9aefdfb8d601b84a14d2d42e89d2e5f27 (diff) | |
Fixes for API changes
Original commit message from CVS:
* ext/aalib/gstaasink.c: (gst_aasink_fixate):
* ext/cairo/gsttextoverlay.c: (gst_text_overlay_collected):
* gst/goom/gstgoom.c: (gst_goom_init), (gst_goom_src_setcaps),
(gst_goom_src_negotiate), (gst_goom_chain):
* gst/matroska/matroska-mux.c:
(gst_matroska_mux_video_pad_setcaps):
* sys/osxvideo/osxvideosink.m:
Fixes for API changes
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/aalib/gstaasink.c | 7 | ||||
| -rw-r--r-- | ext/cairo/gsttextoverlay.c | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/ext/aalib/gstaasink.c b/ext/aalib/gstaasink.c index 42ac0233..90249684 100644 --- a/ext/aalib/gstaasink.c +++ b/ext/aalib/gstaasink.c @@ -236,17 +236,12 @@ static void gst_aasink_fixate (GstPad * pad, GstCaps * caps) { GstStructure *structure; - GValue fps = { 0 }; structure = gst_caps_get_structure (caps, 0); gst_structure_fixate_field_nearest_int (structure, "width", 320); gst_structure_fixate_field_nearest_int (structure, "height", 240); - - g_value_init (&fps, GST_TYPE_FRACTION); - gst_value_set_fraction (&fps, 30, 1); - gst_structure_fixate_field_nearest_fraction (structure, "framerate", &fps); - g_value_unset (&fps); + gst_structure_fixate_field_nearest_fraction (structure, "framerate", 30, 1); } static gboolean diff --git a/ext/cairo/gsttextoverlay.c b/ext/cairo/gsttextoverlay.c index b8bf1c87..1ef6b7dd 100644 --- a/ext/cairo/gsttextoverlay.c +++ b/ext/cairo/gsttextoverlay.c @@ -785,7 +785,7 @@ gst_text_overlay_collected (GstCollectPads * pads, gpointer data) if (GST_BUFFER_DURATION (video_frame) != GST_CLOCK_TIME_NONE) { frame_end = now + GST_BUFFER_DURATION (video_frame); } else if (overlay->fps_n > 0) { - frame_end = now + gst_util_clock_time_scale (GST_SECOND, + frame_end = now + gst_util_uint64_scale_int (GST_SECOND, overlay->fps_d, overlay->fps_n); } else { /* magic value, does not really matter since texts |