diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | gst/matroska/matroska-mux.c | 6 |
2 files changed, 12 insertions, 1 deletions
@@ -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), diff --git a/gst/matroska/matroska-mux.c b/gst/matroska/matroska-mux.c index 1a403c65..111f5c5f 100644 --- a/gst/matroska/matroska-mux.c +++ b/gst/matroska/matroska-mux.c @@ -51,6 +51,10 @@ static GstStaticPadTemplate src_templ = GST_STATIC_PAD_TEMPLATE ("src", "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 @@ static GstStaticPadTemplate videosink_templ = "video/x-msmpeg, " COMMON_VIDEO_CAPS "; " "image/jpeg, " - COMMON_VIDEO_CAPS "; " + COMMON_VIDEO_CAPS_NO_FRAMERATE "; " "video/x-theora; " "video/x-dirac, " COMMON_VIDEO_CAPS "; " |