diff options
| author | nplourde <nplourde@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-05-18 12:24:20 +0000 |
|---|---|---|
| committer | nplourde <nplourde@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-05-18 12:24:20 +0000 |
| commit | 5b963b3ce006276685ca8d03026a147e15ebfd29 (patch) | |
| tree | 6b3e9596da7b6ed4bdfca682f5921c7573416b53 /mencoder.c | |
| parent | ca861c56350e23e6cc60c6bbec6447ec0dc577a5 (diff) | |
| download | mpv-5b963b3ce006276685ca8d03026a147e15ebfd29.tar.bz2 mpv-5b963b3ce006276685ca8d03026a147e15ebfd29.tar.xz | |
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.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15508 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
| -rw-r--r-- | mencoder.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mencoder.c b/mencoder.c index e6398e4f0d..9c9af11a0e 100644 --- a/mencoder.c +++ b/mencoder.c @@ -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 void parse_end_at(); 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 |