# HG changeset patch # User nplourde # Date 1116419060 0 # Node ID 2f4125e4025ec0fe393d6c9cab692da6d313f7b6 # Parent 2b9a8966c53fe7741b5aa3f0b0d63c6cc36c721e 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. diff -r 2b9a8966c53f -r 2f4125e4025e mencoder.c --- a/mencoder.c Wed May 18 12:15:30 2005 +0000 +++ b/mencoder.c Wed May 18 12:24:20 2005 +0000 @@ -72,6 +72,8 @@ #include "osdep/timer.h" +#include "get_path.c" + #ifdef USE_LIBAVCODEC #ifdef USE_LIBAVCODEC_SO #include @@ -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