From 06c87a5fbf4627d6df41b7c1cb7bef82ded69cad Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Sun, 14 Mar 2004 03:31:51 +0000 Subject: [PATCH] gst/asfdemux/gstasfdemux.c: Use 25fps as our "fake" fps value (marked for fixage in 0.9.x) instead of 0. Reason is si... Original commit message from CVS: * gst/asfdemux/gstasfdemux.c: (gst_asf_demux_video_caps), (gst_asf_demux_setup_pad): Use 25fps as our "fake" fps value (marked for fixage in 0.9.x) instead of 0. Reason is simple: some elements have a fps range of 1-max instead of 0-max. So now ASF video actually works. --- ChangeLog | 8 ++++++++ gst/asfdemux/gstasfdemux.c | 5 +++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b3c3d7dec8..3d93234950 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2004-03-13 Ronald Bultje + + * gst/asfdemux/gstasfdemux.c: (gst_asf_demux_video_caps), + (gst_asf_demux_setup_pad): + Use 25fps as our "fake" fps value (marked for fixage in 0.9.x) + instead of 0. Reason is simple: some elements have a fps range + of 1-max instead of 0-max. So now ASF video actually works. + 2004-03-13 Thomas Vander Stichele * po/LINGUAS: diff --git a/gst/asfdemux/gstasfdemux.c b/gst/asfdemux/gstasfdemux.c index 00c30000c1..8c298fc92e 100644 --- a/gst/asfdemux/gstasfdemux.c +++ b/gst/asfdemux/gstasfdemux.c @@ -1626,12 +1626,12 @@ gst_asf_demux_video_caps (guint32 codec_fcc, gst_caps_set_simple (caps, "width", G_TYPE_INT, video->width, "height", G_TYPE_INT, video->height, - "framerate", G_TYPE_DOUBLE, (double) 0, NULL); + "framerate", G_TYPE_DOUBLE, (double) 25, NULL); } else { gst_caps_set_simple (caps, "width", GST_TYPE_INT_RANGE, 1, G_MAXINT, "height", GST_TYPE_INT_RANGE, 1, G_MAXINT, - "framerate", GST_TYPE_DOUBLE_RANGE, 0.0, G_MAXDOUBLE, + "framerate", GST_TYPE_DOUBLE_RANGE, 25.0, G_MAXDOUBLE, NULL); } @@ -1679,6 +1679,7 @@ gst_asf_demux_setup_pad (GstASFDemux *asf_demux, { asf_stream_context *stream; + gst_pad_use_explicit_caps (src_pad); gst_pad_set_explicit_caps (src_pad, caps); gst_pad_set_formats_function (src_pad, gst_asf_demux_get_src_formats); gst_pad_set_event_mask_function (src_pad, gst_asf_demux_get_src_event_mask);