linphone/linphone-2.1.0-imagedir.patch
2008-02-05 19:06:42 +00:00

42 lines
1.4 KiB
Diff

From da74486ae265d7736032e4e51602d54449de11b0 Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jeff@ocjtech.us>
Date: Tue, 17 Apr 2007 15:27:06 -0500
Subject: [PATCH] Move nowebcam image to subdir.
---
mediastreamer2/src/Makefile.am | 2 +-
mediastreamer2/src/nowebcam.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/mediastreamer2/src/Makefile.am b/mediastreamer2/src/Makefile.am
index 9c9050c..8717329 100644
--- a/mediastreamer2/src/Makefile.am
+++ b/mediastreamer2/src/Makefile.am
@@ -121,7 +121,7 @@ if BUILD_VIDEO
AM_CFLAGS+=$(VIDEO_CFLAGS)
endif
-imgdir=$(datadir)/images/
+imgdir=$(datadir)/images/linphone/
img_DATA=nowebcamCIF.jpg
diff --git a/mediastreamer2/src/nowebcam.c b/mediastreamer2/src/nowebcam.c
index 1c694f9..f8eaaf9 100644
--- a/mediastreamer2/src/nowebcam.c
+++ b/mediastreamer2/src/nowebcam.c
@@ -85,8 +85,8 @@ mblk_t *ms_load_jpeg_as_yuv(const char *jpgpath, MSVideoSize *reqsize){
mblk_t *ms_load_nowebcam(MSVideoSize *reqsize, int idx){
char tmp[256];
if (idx<0)
- snprintf(tmp, sizeof(tmp), "%s/images/%s.jpg", PACKAGE_DATA_DIR, NOWEBCAM_JPG);
+ snprintf(tmp, sizeof(tmp), "%s/images/linphone/%s.jpg", PACKAGE_DATA_DIR, NOWEBCAM_JPG);
else
- snprintf(tmp, sizeof(tmp), "%s/images/%s%i.jpg", PACKAGE_DATA_DIR, NOWEBCAM_JPG, idx);
+ snprintf(tmp, sizeof(tmp), "%s/images/linphone/%s%i.jpg", PACKAGE_DATA_DIR, NOWEBCAM_JPG, idx);
return ms_load_jpeg_as_yuv(tmp,reqsize);
}
--
1.5.3.8