From 9d0c9fe49b9d721adac22a75dba0a7bdbb67cdc2 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Sat, 22 Nov 2008 14:44:26 +0000 Subject: [PATCH] gst/videorate/gstvideorate.c: Add jpeg and png image media types to the caps. Fixes #561436. Original commit message from CVS: * gst/videorate/gstvideorate.c: Add jpeg and png image media types to the caps. Fixes #561436. --- ChangeLog | 5 +++++ gst/videorate/gstvideorate.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5150abd..b7692e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2008-11-22 Wim Taymans + * gst/videorate/gstvideorate.c: + Add jpeg and png image media types to the caps. Fixes #561436. + +2008-11-22 Wim Taymans + * gst/playback/gstplaysink.c: (gen_audio_chain): Don't post an error when we can't configure the volume but post a warning instead. Fixes #561780. diff --git a/gst/videorate/gstvideorate.c b/gst/videorate/gstvideorate.c index f38d8d0..8d22186 100644 --- a/gst/videorate/gstvideorate.c +++ b/gst/videorate/gstvideorate.c @@ -109,14 +109,14 @@ static GstStaticPadTemplate gst_video_rate_src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, - GST_STATIC_CAPS ("video/x-raw-yuv; video/x-raw-rgb") + GST_STATIC_CAPS ("video/x-raw-yuv; video/x-raw-rgb; image/jpeg; image/png") ); static GstStaticPadTemplate gst_video_rate_sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_SINK, GST_PAD_ALWAYS, - GST_STATIC_CAPS ("video/x-raw-yuv; video/x-raw-rgb") + GST_STATIC_CAPS ("video/x-raw-yuv; video/x-raw-rgb; image/jpeg; image/png") ); static void gst_video_rate_swap_prev (GstVideoRate * videorate, -- 2.7.4