From 7d1805fda41615e2f4ae15cfdaf9d957ea73991b 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/avi/gstavimux.c | 22 ++++++++++++++++------ 2 files changed, 22 insertions(+), 6 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/avi/gstavimux.c b/gst/avi/gstavimux.c index bdd1637..0b70945 100644 --- a/gst/avi/gstavimux.c +++ b/gst/avi/gstavimux.c @@ -70,38 +70,48 @@ static GstStaticPadTemplate video_sink_factory = GST_STATIC_CAPS ("video/x-raw-yuv, " "format = (fourcc) { YUY2, I420 }, " "width = (int) [ 16, 4096 ], " - "height = (int) [ 16, 4096 ]; " + "height = (int) [ 16, 4096 ], " + "framerate = (double) [ 0, MAX ]; " "image/jpeg, " "width = (int) [ 16, 4096 ], " - "height = (int) [ 16, 4096 ]; " + "height = (int) [ 16, 4096 ], " + "framerate = (double) [ 0, MAX ]; " "video/x-divx, " "width = (int) [ 16, 4096 ], " "height = (int) [ 16, 4096 ], " + "framerate = (double) [ 0, MAX ], " "divxversion = (int) [ 3, 5 ]; " "video/x-xvid, " "width = (int) [ 16, 4096 ], " - "height = (int) [ 16, 4096 ]; " + "height = (int) [ 16, 4096 ], " + "framerate = (double) [ 0, MAX ]; " "video/x-3ivx, " "width = (int) [ 16, 4096 ], " - "height = (int) [ 16, 4096 ]; " + "height = (int) [ 16, 4096 ], " + "framerate = (double) [ 0, MAX ]; " "video/x-msmpeg, " "width = (int) [ 16, 4096 ], " "height = (int) [ 16, 4096 ], " + "framerate = (double) [ 0, MAX ], " "msmpegversion = (int) [ 41, 43 ]; " "video/mpeg, " "width = (int) [ 16, 4096 ], " "height = (int) [ 16, 4096 ], " + "framerate = (double) [ 0, MAX ], " "mpegversion = (int) 1, " "systemstream = (boolean) FALSE; " "video/x-h263, " "width = (int) [ 16, 4096 ], " - "height = (int) [ 16, 4096 ]; " + "height = (int) [ 16, 4096 ], " + "framerate = (double) [ 0, MAX ]; " "video/x-dv, " "width = (int) 720, " "height = (int) { 576, 480 }, " + "framerate = (double) [ 0, MAX ], " "systemstream = (boolean) FALSE; " "video/x-huffyuv, " - "width = (int) [ 16, 4096 ], " "height = (int) [ 16, 4096 ]") + "width = (int) [ 16, 4096 ], " + "height = (int) [ 16, 4096 ], " "framerate = (double) [ 0, MAX ]") ); static GstStaticPadTemplate audio_sink_factory = -- 2.7.4