Mercurial > mplayer.hg

changeset 15507:2f4125e4025e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author nplourde
date Wed, 18 May 2005 12:24:20 +0000
parents 2b9a8966c53f
children a8b8aac04c9e
files mencoder.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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 <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