summaryrefslogtreecommitdiffstats
path: root/ext
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@ronald.bitfreak.net>2002-01-17 12:41:05 +0000
committerRonald S. Bultje <rbultje@ronald.bitfreak.net>2002-01-17 12:41:05 +0000
commit07819510e9177ef212a47a783b18047329dacccb (patch)
tree3dce6f1e8909f1b1bf4d09a8a14003515b797b92 /ext
parentd5787f754ff011ff5e9d06396b90ba6153690d98 (diff)
downloadgst-plugins-bad-07819510e9177ef212a47a783b18047329dacccb.tar.gz
gst-plugins-bad-07819510e9177ef212a47a783b18047329dacccb.tar.bz2
gst-plugins-bad-07819510e9177ef212a47a783b18047329dacccb.zip
jpegmmx addition and some small changes
Original commit message from CVS: jpegmmx addition and some small changes
Diffstat (limited to 'ext')
-rw-r--r--ext/Makefile.am26
-rw-r--r--ext/sdl/sdlvideosink.c7
2 files changed, 20 insertions, 13 deletions
diff --git a/ext/Makefile.am b/ext/Makefile.am
index bd24b637..c163c99c 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -106,6 +106,12 @@ else
JPEG_DIR=
endif
+if USE_MJPEGTOOLS
+JPEG_MMX_DIR=jpeg-mmx
+else
+JPEG_MMX_DIR=
+endif
+
LADSPA_DIR=ladspa
if USE_LAME
@@ -192,11 +198,11 @@ SUBDIRS=$(A52DEC_DIR) $(AALIB_DIR) $(ALSA_DIR) \
$(DVDREAD_DIR) $(ESD_DIR) $(FESTIVAL_DIR) \
$(FLAC_DIR) $(GNOMEVFS_DIR) $(GSM_DIR) \
$(HERMES_DIR) $(HTTP_DIR) $(JPEG_DIR) \
- $(LADSPA_DIR) $(LAME_DIR) $(MAD_DIR) \
- $(MIKMOD_DIR) $(MPEG2DEC_DIR) $(OPENQUICKTIME_DIR) \
- $(RAW1394_DIR) $(RTP_DIR) $(SDL_DIR) \
- $(SHOUT_DIR) $(SIDPLAY_DIR) $(SMOOTHWAVE_DIR) \
- $(VORBIS_DIR) $(XMMS_DIR)
+ $(JPEG_MMX_DIR) $(LADSPA_DIR) $(LAME_DIR) \
+ $(MAD_DIR) $(MIKMOD_DIR) $(MPEG2DEC_DIR) \
+ $(OPENQUICKTIME_DIR) $(RAW1394_DIR) $(RTP_DIR) \
+ $(SDL_DIR) $(SHOUT_DIR) $(SIDPLAY_DIR) \
+ $(SMOOTHWAVE_DIR) $(VORBIS_DIR) $(XMMS_DIR)
DIST_SUBDIRS=\
a52dec aalib alsa \
@@ -205,8 +211,8 @@ DIST_SUBDIRS=\
dvdread esd festival \
flac gnomevfs gsm \
hermes http jpeg \
- ladspa lame mad \
- mikmod mpeg2dec openquicktime \
- raw1394 rtp sdl \
- shout sidplay smoothwave \
- vorbis xmms
+ jpeg-mmx ladspa lame \
+ mad mikmod mpeg2dec \
+ openquicktime raw1394 rtp \
+ sdl shout sidplay \
+ smoothwave vorbis xmms
diff --git a/ext/sdl/sdlvideosink.c b/ext/sdl/sdlvideosink.c
index af49e66c..aadaecf2 100644
--- a/ext/sdl/sdlvideosink.c
+++ b/ext/sdl/sdlvideosink.c
@@ -432,9 +432,10 @@ gst_sdlvideosink_set_property (GObject *object, guint prop_id, const GValue *val
case ARG_XID:
sdlvideosink->window_id = g_value_get_int(value);
break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
}
-
- sdlvideosink = GST_SDLVIDEOSINK (object);
}
@@ -461,7 +462,7 @@ gst_sdlvideosink_get_property (GObject *object, guint prop_id, GValue *value, GP
g_value_set_int (value, sdlvideosink->frame_time/1000000);
break;
default:
- /*G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);*/
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}