summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.ac16
-rw-r--r--ext/Makefile.am26
-rw-r--r--ext/sdl/sdlvideosink.c7
3 files changed, 27 insertions, 22 deletions
diff --git a/configure.ac b/configure.ac
index 48d252ec..857f96cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -522,15 +522,12 @@ GST_CHECK_FEATURE(JPEG, [jpeg], jpegenc jpegdec, [
AC_SUBST(JPEG_LIBS)
])
-dnl *** jpeg-mmx ***
-AC_ARG_WITH(jpeg-mmx-path, [ --with-jpeg-mmx-path, path to mmx accelerated jpeg lib])
-translit(dnm, m, l) AM_CONDITIONAL(USE_JPEG_MMX, true)
-GST_CHECK_FEATURE(JPEG_MMX, [jpeg-mmx], jpegmmxenc jpegmmxdec, [
- AC_CHECK_LIB(jpeg-mmx, jpeg_start_compress, HAVE_JPEG_MMX="yes", HAVE_JPEG_MMX="no", "-L$with_jpeg_mmx_path")
- JPEG_MMX_LIBS="-L$with_jpeg_mmx_path -ljpeg-mmx"
- JPEG_MMX_CFLAGS="-I$with_jpeg_mmx_path"
- AC_SUBST(JPEG_MMX_LIBS)
- AC_SUBST(JPEG_MMX_CFLAGS)
+dnl *** mjpegtools ***
+translit(dnm, m, l) AM_CONDITIONAL(USE_MJPEGTOOLS, true)
+GST_CHECK_FEATURE(MJPEGTOOLS, [mjpegtools], jpegmmxenc jpegmmxdec, [
+ PKG_CHECK_MODULES(MJPEGTOOLS, mjpegtools, HAVE_MJPEGTOOLS="yes", HAVE_MJPEGTOOLS="no")
+ AC_SUBST(MJPEGTOOLS_LIBS)
+ AC_SUBST(MJPEGTOOLS_CFLAGS)
])
dnl *** mad ***
@@ -1037,6 +1034,7 @@ ext/gsm/Makefile
ext/hermes/Makefile
ext/http/Makefile
ext/jpeg/Makefile
+ext/jpeg-mmx/Makefile
ext/ladspa/Makefile
ext/lame/Makefile
ext/mad/Makefile
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;
}
}