diff options
author | Jan Schmidt <thaytan@mad.scientist.com> | 2005-11-28 12:59:05 +0000 |
---|---|---|
committer | Jan Schmidt <thaytan@mad.scientist.com> | 2005-11-28 12:59:05 +0000 |
commit | bad1f0307a7e46cf016d21c3aa8e6423e35cb058 (patch) | |
tree | af7417c2a06306431718b18d642836b43dfedd57 | |
parent | b9d371913c66db1e4a430fdb3ebae449532563db (diff) |
gst/matroska/matroska-mux.c: From Michal Benes: frame duration should be GST_SECOND / framerate, not
Original commit message from CVS:
* gst/matroska/matroska-mux.c:
(gst_matroska_mux_video_pad_setcaps):
From Michal Benes:
frame duration should be GST_SECOND / framerate, not
GST_SECOND * framerate. (Fixes: #322643)
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | gst/matroska/matroska-mux.c | 4 |
2 files changed, 10 insertions, 2 deletions
@@ -1,3 +1,11 @@ +2005-11-28 Jan Schmidt <thaytan@mad.scientist.com> + + * gst/matroska/matroska-mux.c: + (gst_matroska_mux_video_pad_setcaps): + From Michal Benes: + frame duration should be GST_SECOND / framerate, not + GST_SECOND * framerate. (Fixes: #322643) + 2005-11-27 Thomas Vander Stichele <thomas at apestaart dot org> * configure.ac: diff --git a/gst/matroska/matroska-mux.c b/gst/matroska/matroska-mux.c index 45333f1f..4de8b1b2 100644 --- a/gst/matroska/matroska-mux.c +++ b/gst/matroska/matroska-mux.c @@ -451,8 +451,8 @@ gst_matroska_mux_video_pad_setcaps (GstPad * pad, GstCaps * caps) videocontext->pixel_width = width; videocontext->pixel_height = height; context->default_duration = gst_util_uint64_scale_int (GST_SECOND, - gst_value_get_fraction_numerator (framerate), - gst_value_get_fraction_denominator (framerate)); + gst_value_get_fraction_denominator (framerate), + gst_value_get_fraction_numerator (framerate)); ret = gst_structure_get_int (structure, "pixel_width", &pixel_width); ret &= gst_structure_get_int (structure, "pixel_height", &pixel_height); |