From a895112c29c36e8847dc4a5edade43824e36a191 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.net>
Date: Tue, 8 Jan 2008 20:03:30 +0000
Subject: [PATCH] gst/matroska/matroska-mux.c: Also fix up pad templates to
 indicate that image/jpeg doesn't absolutely require the fra...

Original commit message from CVS:
* 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).
---
 ChangeLog                   | 7 +++++++
 gst/matroska/matroska-mux.c | 6 +++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 60e90b44f3..dc3539645a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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>
diff --git a/gst/matroska/matroska-mux.c b/gst/matroska/matroska-mux.c
index 1a403c655e..111f5c5ffe 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 "; "