Mercurial > mplayer.hg
comparison mencoder.c @ 21412:8a0377eabdb3
fix mencoder include clash on osx
| author | nplourde |
|---|---|
| date | Fri, 01 Dec 2006 23:48:07 +0000 |
| parents | b806ccbc6398 |
| children | ca9da45d13e9 |
comparison
equal
deleted
inserted
replaced
| 21411:ff51dbb55ace | 21412:8a0377eabdb3 |
|---|---|
| 46 #include "codec-cfg.h" | 46 #include "codec-cfg.h" |
| 47 #include "m_option.h" | 47 #include "m_option.h" |
| 48 #include "m_config.h" | 48 #include "m_config.h" |
| 49 #include "parser-mecmd.h" | 49 #include "parser-mecmd.h" |
| 50 | 50 |
| 51 #include "get_path.c" | |
| 52 | |
| 51 #include "stream/stream.h" | 53 #include "stream/stream.h" |
| 52 #include "libmpdemux/demuxer.h" | 54 #include "libmpdemux/demuxer.h" |
| 53 #include "libmpdemux/stheader.h" | 55 #include "libmpdemux/stheader.h" |
| 54 #include "libmpdemux/mp3_hdr.h" | 56 #include "libmpdemux/mp3_hdr.h" |
| 55 #include "libmpdemux/muxer.h" | 57 #include "libmpdemux/muxer.h" |
| 70 #include <inttypes.h> | 72 #include <inttypes.h> |
| 71 | 73 |
| 72 #include "libvo/fastmemcpy.h" | 74 #include "libvo/fastmemcpy.h" |
| 73 | 75 |
| 74 #include "osdep/timer.h" | 76 #include "osdep/timer.h" |
| 75 | |
| 76 #include "get_path.c" | |
| 77 | 77 |
| 78 #ifdef USE_DVDREAD | 78 #ifdef USE_DVDREAD |
| 79 #include "stream/stream_dvd.h" | 79 #include "stream/stream_dvd.h" |
| 80 #endif | 80 #endif |
| 81 | 81 |