From: <tp...@ke...> - 2008-01-08 20:03:38
|
CVS Root: /cvs/gstreamer Module: gst-plugins-good Changes by: tpm Date: Tue Jan 08 2008 20:03:44 UTC Log message: * gst/matroska/matroska-mux.c: (COMMON_VIDEO_CAPS_NO_FRAMERATE), (videosink_templ): Also fix up pad templates to indicate that image/jpeg doesn't absolutely require the framerate property to be set (#504081). Modified files: . : ChangeLog gst/matroska : matroska-mux.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ChangeLog.diff?r1=1.3235&r2=1.3236 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/gst/matroska/matroska-mux.c.diff?r1=1.53&r2=1.54 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-good/ChangeLog,v retrieving revision 1.3235 retrieving revision 1.3236 diff -u -d -r1.3235 -r1.3236 --- ChangeLog 8 Jan 2008 19:57:22 -0000 1.3235 +++ ChangeLog 8 Jan 2008 20:03:28 -0000 1.3236 @@ -1,5 +1,12 @@ 2008-01-08 Tim-Philipp Müller <tim at centricular dot net> + * gst/matroska/matroska-mux.c: (COMMON_VIDEO_CAPS_NO_FRAMERATE), + (videosink_templ): + Also fix up pad templates to indicate that image/jpeg doesn't + absolutely require the framerate property to be set (#504081). + +2008-01-08 Tim-Philipp Müller <tim at centricular dot net> Based on patch by: Wouter Cloetens <wouter at mind be> * gst/matroska/matroska-mux.c: (gst_matroska_mux_video_pad_setcaps), Index: matroska-mux.c RCS file: /cvs/gstreamer/gst-plugins-good/gst/matroska/matroska-mux.c,v retrieving revision 1.53 retrieving revision 1.54 diff -u -d -r1.53 -r1.54 --- matroska-mux.c 8 Jan 2008 19:57:23 -0000 1.53 +++ matroska-mux.c 8 Jan 2008 20:03:30 -0000 1.54 @@ -51,6 +51,10 @@ "height = (int) [ 16, 4096 ], " \ "framerate = (fraction) [ 0, MAX ]" +#define COMMON_VIDEO_CAPS_NO_FRAMERATE \ + "width = (int) [ 16, 4096 ], " \ + "height = (int) [ 16, 4096 ] " static GstStaticPadTemplate videosink_templ = GST_STATIC_PAD_TEMPLATE ("video_%d", GST_PAD_SINK, @@ -74,7 +78,7 @@ "video/x-msmpeg, " COMMON_VIDEO_CAPS "; " "image/jpeg, " - COMMON_VIDEO_CAPS "; " + COMMON_VIDEO_CAPS_NO_FRAMERATE "; " "video/x-theora; " "video/x-dirac, " |