Mercurial > mplayer.hg
comparison mencoder.c @ 15507:2f4125e4025e
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 | af245d15f502 |
children | 4ac9c227d758 |
comparison
equal
deleted
inserted
replaced
15506:2b9a8966c53f | 15507:2f4125e4025e |
---|---|
70 | 70 |
71 #include "libvo/fastmemcpy.h" | 71 #include "libvo/fastmemcpy.h" |
72 | 72 |
73 #include "osdep/timer.h" | 73 #include "osdep/timer.h" |
74 | 74 |
75 #include "get_path.c" | |
76 | |
75 #ifdef USE_LIBAVCODEC | 77 #ifdef USE_LIBAVCODEC |
76 #ifdef USE_LIBAVCODEC_SO | 78 #ifdef USE_LIBAVCODEC_SO |
77 #include <ffmpeg/avcodec.h> | 79 #include <ffmpeg/avcodec.h> |
78 #else | 80 #else |
79 #include "libavcodec/avcodec.h" | 81 #include "libavcodec/avcodec.h" |
227 static off_t seek_to_byte=0; | 229 static off_t seek_to_byte=0; |
228 | 230 |
229 static void parse_end_at(); | 231 static void parse_end_at(); |
230 static char * end_at_string=0; | 232 static char * end_at_string=0; |
231 //static uint8_t* flip_upside_down(uint8_t* dst, const uint8_t* src, int width, int height); | 233 //static uint8_t* flip_upside_down(uint8_t* dst, const uint8_t* src, int width, int height); |
232 | |
233 #include "get_path.c" | |
234 | 234 |
235 #ifdef USE_EDL | 235 #ifdef USE_EDL |
236 #include "edl.h" | 236 #include "edl.h" |
237 static edl_record_ptr edl_records = NULL; ///< EDL entries memory area | 237 static edl_record_ptr edl_records = NULL; ///< EDL entries memory area |
238 static edl_record_ptr next_edl_record = NULL; ///< only for traversing edl_records | 238 static edl_record_ptr next_edl_record = NULL; ///< only for traversing edl_records |