From 456f8b822ab40a0442ac1db313b3ae5f8f37d376 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Sun, 24 Oct 2004 21:22:07 +0000 Subject: [PATCH] gst/: Framerate. Original commit message from CVS: * gst/asfdemux/gstasfmux.c: * gst/avi/gstavimux.c: Framerate. --- ChangeLog | 6 ++++++ gst/asfdemux/gstasfmux.c | 27 ++++++++++++++++++--------- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0b4d1b8..14574e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2004-10-24 Ronald S. Bultje + * gst/asfdemux/gstasfmux.c: + * gst/avi/gstavimux.c: + Framerate. + +2004-10-24 Ronald S. Bultje + * sys/v4l2/gstv4l2element.c: (gst_v4l2element_set_property): Fix properties (channel, norm, frequency). diff --git a/gst/asfdemux/gstasfmux.c b/gst/asfdemux/gstasfmux.c index adc4ad6..3bcc83f 100644 --- a/gst/asfdemux/gstasfmux.c +++ b/gst/asfdemux/gstasfmux.c @@ -83,38 +83,47 @@ static GstStaticPadTemplate gst_asfmux_videosink_template = GST_STATIC_CAPS ("video/x-raw-yuv, " "format = (fourcc) { YUY2, I420 }, " "width = (int) [ 1, MAX], " - "height = (int) [ 1, MAX]; " + "height = (int) [ 1, MAX], " + "framerate = (double) [ 1, MAX ]; " "image/jpeg, " "width = (int) [ 1, MAX], " - "height = (int) [ 1, MAX]; " + "height = (int) [ 1, MAX], " + "framerate = (double) [ 1, MAX ]; " "video/x-divx, " "divxversion = (int) [ 3, 5 ], " "width = (int) [ 1, MAX], " - "height = (int) [ 1, MAX]; " + "height = (int) [ 1, MAX], " + "framerate = (double) [ 1, MAX ]; " "video/x-xvid, " "width = (int) [ 1, MAX], " - "height = (int) [ 1, MAX]; " + "height = (int) [ 1, MAX], " + "framerate = (double) [ 1, MAX ]; " "video/x-3ivx, " "width = (int) [ 1, MAX], " - "height = (int) [ 1, MAX]; " + "height = (int) [ 1, MAX], " + "framerate = (double) [ 1, MAX ]; " "video/x-msmpeg, " "msmpegversion = (int) [ 41, 43 ], " "width = (int) [ 1, MAX], " - "height = (int) [ 1, MAX]; " + "height = (int) [ 1, MAX], " + "framerate = (double) [ 1, MAX ]; " "video/mpeg, " "mpegversion = (int) 1," "systemstream = (boolean) false," "width = (int) [ 1, MAX], " - "height = (int) [ 1, MAX]; " + "height = (int) [ 1, MAX], " + "framerate = (double) [ 1, MAX ]; " "video/x-h263, " "width = (int) [ 1, MAX], " - "height = (int) [ 1, MAX]; " + "height = (int) [ 1, MAX], " + "framerate = (double) [ 1, MAX ]; " "video/x-dv, " "systemstream = (boolean) false," "width = (int) 720," "height = (int) { 576, 480 };" "video/x-huffyuv, " - "width = (int) [ 1, MAX], " "height = (int) [ 1, MAX]") + "width = (int) [ 1, MAX], " + "height = (int) [ 1, MAX], " "framerate = (double) [ 1, MAX ]") ); static GstStaticPadTemplate gst_asfmux_audiosink_template = -- 2.7.4