diff options
| author | Tim-Philipp Müller <tim@centricular.net> | 2008-01-08 20:03:30 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.net> | 2008-01-08 20:03:30 +0000 |
| commit | a895112c29c36e8847dc4a5edade43824e36a191 (patch) | |
| tree | 5beb7ab97c33ce54b3c3ae9cb65dac834b22d821 /gst/matroska/matroska-mux.c | |
| parent | 0a3ae38bf0c99f3bed14f3579ba41049afd8ce70 (diff) | |
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).
Diffstat (limited to 'gst/matroska/matroska-mux.c')
| -rw-r--r-- | gst/matroska/matroska-mux.c | 6 |
1 files changed, 5 insertions, 1 deletions
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 "; " |