[MPlayer-cvslog] CVS: main mencoder.c,1.282,1.283

[Nicolas Plourde CVS]

CVS change done by Nicolas Plourde CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv18691

Modified Files:
	mencoder.c 
Log Message:
include get_path.c before avcodec.h, fix error on osx + gcc4 where defined macro always_inline in libavcodec/common.h already exist in math.h and used for something else.


Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -r1.282 -r1.283
--- mencoder.c	7 May 2005 14:50:14 -0000	1.282
+++ mencoder.c	18 May 2005 12:24:20 -0000	1.283
@@ -72,6 +72,8 @@
 
 #include "osdep/timer.h"
 
+#include "get_path.c"
+
 #ifdef USE_LIBAVCODEC
 #ifdef USE_LIBAVCODEC_SO
 #include <ffmpeg/avcodec.h>
@@ -230,8 +232,6 @@
 static char * end_at_string=0;
 //static uint8_t* flip_upside_down(uint8_t* dst, const uint8_t* src, int width, int height);
 
-#include "get_path.c"
-
 #ifdef USE_EDL
 #include "edl.h"
 static edl_record_ptr edl_records = NULL; ///< EDL entries memory area