From 96d5f727fea40bf8bcc9065a5eaea3a2668bfd6a Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Mon, 28 Nov 2005 15:13:22 +0000 Subject: gst/matroska/matroska-mux.c: Look for pixel-aspect-ratio in caps, not pixel_width and pixel_height (Fixes: #322645) Original commit message from CVS: * gst/matroska/matroska-mux.c: (gst_matroska_mux_video_pad_setcaps): Look for pixel-aspect-ratio in caps, not pixel_width and pixel_height (Fixes: #322645) --- gst/matroska/matroska-mux.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'gst/matroska') diff --git a/gst/matroska/matroska-mux.c b/gst/matroska/matroska-mux.c index 4de8b1b2..709840d8 100644 --- a/gst/matroska/matroska-mux.c +++ b/gst/matroska/matroska-mux.c @@ -426,7 +426,6 @@ gst_matroska_mux_video_pad_setcaps (GstPad * pad, GstCaps * caps) gint width, height, pixel_width, pixel_height; const GValue *framerate; GstStructure *structure; - gboolean ret; /* find context */ collect_pad = (GstMatroskaPad *) gst_pad_get_element_private (pad); @@ -454,9 +453,8 @@ gst_matroska_mux_video_pad_setcaps (GstPad * pad, GstCaps * caps) 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); - if (ret) { + if (gst_structure_get_fraction (structure, "pixel-aspect-ratio", + &pixel_width, &pixel_height)) { if (pixel_width > pixel_height) { videocontext->display_width = width * pixel_width / pixel_height; videocontext->display_height = height; -- cgit