From 0a4089343ddc17f68212012215fd878341278112 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Thu, 29 Apr 2004 17:37:01 +0000 Subject: ext/jpeg/: move format setting to inner loop Original commit message from CVS: * ext/jpeg/gstjpegdec.c: (gst_jpegdec_get_type): * ext/jpeg/gstjpegenc.c: (gst_jpegenc_get_type), (gst_jpegenc_getcaps): move format setting to inner loop * gst/ffmpegcolorspace/gstffmpegcolorspace.c: (gst_ffmpegcolorspace_getcaps): use GST_PAD_CAPS if available so that we use already negotiated caps * gst/qtdemux/qtdemux.c: (gst_qtdemux_loop_header), (qtdemux_parse_moov), (qtdemux_parse): extra debugging * sys/qcam/qcam-Linux.c: (qc_lock_wait), (qc_unlock): * sys/qcam/qcam-os.c: (qc_lock_wait), (qc_unlock): move hardcoded path to DEFINE --- ext/jpeg/gstjpegenc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'ext') diff --git a/ext/jpeg/gstjpegenc.c b/ext/jpeg/gstjpegenc.c index 57eaaf91..696d9612 100644 --- a/ext/jpeg/gstjpegenc.c +++ b/ext/jpeg/gstjpegenc.c @@ -246,13 +246,13 @@ gst_jpegenc_getcaps (GstPad * pad) gst_structure_set_name (structure, name); gst_structure_remove_field (structure, "format"); + /* ... but for the sink pad, we only do I420 anyway, so add that */ + if (pad == jpegenc->sinkpad) { + gst_structure_set (structure, "format", GST_TYPE_FOURCC, + GST_STR_FOURCC ("I420"), NULL); + } } - /* ... but for the sink pad, we only do I420 anyway, so add that */ - if (pad == jpegenc->sinkpad) { - gst_structure_set (structure, "format", GST_TYPE_FOURCC, - GST_STR_FOURCC ("I420"), NULL); - } return caps; } -- cgit