From 4ae65e53bf3a550e4ddb187ed5f6ae200eaddd07 Mon Sep 17 00:00:00 2001
From: smorlat <smorlat@3f6dc0c8-ddfe-455d-9043-3cd528dc4637>
Date: Thu, 2 Apr 2009 16:19:15 +0000
Subject: [PATCH] fix warning fix compilation error with lastest ffmpeg
git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@401 3f6dc0c8-ddfe-455d-9043-3cd528dc4637
---
linphone/gtk-glade/main.c | 2 ++
linphone/mediastreamer2/src/pixconv.c | 4 ----
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/linphone/gtk-glade/main.c b/linphone/gtk-glade/main.c
index 37997681ff..73897050fc 100644
--- a/linphone/gtk-glade/main.c
+++ b/linphone/gtk-glade/main.c
@@ -893,7 +893,9 @@ void linphone_gtk_log_handler(OrtpLogLevel lev, const char *fmt, va_list args){
}
int main(int argc, char *argv[]){
+#ifdef ENABLE_NLS
void *p;
+#endif
const char *config_file;
const char *lang;
diff --git a/linphone/mediastreamer2/src/pixconv.c b/linphone/mediastreamer2/src/pixconv.c
index 5bcd114fcd..24fc1c4344 100644
--- a/linphone/mediastreamer2/src/pixconv.c
+++ b/linphone/mediastreamer2/src/pixconv.c
@@ -28,10 +28,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
extern void ms_ffmpeg_check_init();
-#ifndef PIX_FMT_YUYV422
-#define PIX_FMT_YUYV422 PIX_FMT_YUV422
-#endif
-
int ms_pix_fmt_to_ffmpeg(MSPixFmt fmt){
switch(fmt){
case MS_RGB24:
--
GitLab