From fe3d02a6ca570c71ddf68bde3ceb543de061f2ca Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Thu, 15 Jul 2004 23:56:05 +0000 Subject: gst-libs/gst/riff/riff-media.c: mp42/mp43 (no caps) exist too. Original commit message from CVS: * gst-libs/gst/riff/riff-media.c: (gst_riff_create_video_caps_with_data): mp42/mp43 (no caps) exist too. * gst/matroska/matroska-demux.c: (gst_matroska_demux_video_caps): Set pixel_width/height; we've got them in-caps. * gst/typefind/gsttypefindfunctions.c: (plugin_init): * gst/wavparse/gstwavparse.c: (plugin_init): Both are valid primary. * sys/oss/gstossmixer.c: Remove i18n hack and enable translations. --- gst/matroska/matroska-demux.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gst/matroska/matroska-demux.c') diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c index 4ff21de3..ae670c68 100644 --- a/gst/matroska/matroska-demux.c +++ b/gst/matroska/matroska-demux.c @@ -2445,7 +2445,7 @@ gst_matroska_demux_video_caps (GstMatroskaTrackVideoContext * videocontext, "width", GST_TYPE_INT_RANGE, 16, 4096, "height", GST_TYPE_INT_RANGE, 16, 4096, NULL); } -#if 0 + if (videocontext->display_width > 0 && videocontext->display_height > 0) { gint w = 100 * videocontext->display_width / videocontext->pixel_width; @@ -2455,8 +2455,12 @@ gst_matroska_demux_video_caps (GstMatroskaTrackVideoContext * videocontext, gst_structure_set (structure, "pixel_width", G_TYPE_INT, w, "pixel_height", G_TYPE_INT, h, NULL); + } else { + gst_structure_set (structure, + "pixel_width", G_TYPE_INT, 1, + "pixel_height", G_TYPE_INT, 1, NULL); } -#endif + if (context->default_duration > 0) { gfloat framerate = 1. * GST_SECOND / context->default_duration; -- cgit