mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-13 11:34:10 +00:00
Code Issues 1 Projects Releases Wiki Activity

ext/jpeg/: move format setting to inner loop

Browse source 
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
This commit is contained in:
Thomas Vander Stichele 2004-04-29 17:37:01 +00:00
parent b2b8ee0908
commit c3c9ba6297
2 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
ChangeLog
View file

@ -1,3 +1,20 @@
2004-04-29 Thomas Vander Stichele <thomas at apestaart dot org>
* 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
2004-04-28 David Schleef <ds@schleef.org>
* gst/speed/gstspeed.c: (speed_parse_caps): Fix caps parsing.

10
gst/ffmpegcolorspace/gstffmpegcolorspace.c
View file

@ -62,7 +62,7 @@ struct _GstFFMpegColorspaceClass
/* elementfactory information */
static GstElementDetails ffmpegcolorspace_details = {
"FFMPEG Colorspace converter",
"FFMPEG-based colorspace converter in gst-plugins",
"Filter/Converter/Video",
"Converts video from one colorspace to another",
"Ronald Bultje <rbultje@ronald.bitfreak.net>",
@ -143,7 +143,7 @@ static GstCaps *
gst_ffmpegcolorspace_getcaps (GstPad * pad)
{
GstFFMpegColorspace *space;
GstCaps *othercaps;
GstCaps *othercaps = NULL;
GstCaps *caps;
GstPad *otherpad;
@ -151,7 +151,11 @@ gst_ffmpegcolorspace_getcaps (GstPad * pad)
otherpad = (pad == space->srcpad) ? space->sinkpad : space->srcpad;
othercaps = gst_pad_get_allowed_caps (otherpad);
/* use already negotiated caps if they exist */
if (GST_PAD_CAPS (otherpad))
othercaps = gst_caps_copy (GST_PAD_CAPS (otherpad));
if (!othercaps)
othercaps = gst_pad_get_allowed_caps (otherpad);
othercaps = gst_ffmpegcolorspace_caps_remove_format_info (othercaps);