diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-08-18 02:29:37 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-08-18 02:29:37 +0300 |
| commit | 95da34aa071d64b21ef3e952b987ba3dcee84ca0 (patch) | |
| tree | eabf4399e40fd270714c53d40688eadadfd4c5ff /mplayer.c | |
| parent | f394231f5de9d1ff679f1b2da4d1f1b303ae914a (diff) | |
| parent | 3961e12fca2f1ec10c64e3ff298828feecca52c9 (diff) | |
| download | mpv-95da34aa071d64b21ef3e952b987ba3dcee84ca0.tar.bz2 mpv-95da34aa071d64b21ef3e952b987ba3dcee84ca0.tar.xz | |
Merge svn changes up to r29532
Diffstat (limited to 'mplayer.c')
| -rw-r--r-- | mplayer.c | 10 |
1 files changed, 1 insertions, 9 deletions
@@ -103,17 +103,12 @@ char *heartbeat_cmd; #endif /* __linux__ */ #endif /* HAVE_RTC */ -#ifdef CONFIG_TV #include "stream/tv.h" -#endif -#ifdef CONFIG_RADIO #include "stream/stream_radio.h" -#endif - #ifdef CONFIG_DVBIN #include "stream/dvbin.h" -#include "stream/cache2.h" #endif +#include "stream/cache2.h" //**************************************************************************// // Playtree @@ -149,10 +144,7 @@ static int max_framesize=0; #ifdef CONFIG_DVDREAD #include "stream/stream_dvd.h" #endif - -#ifdef CONFIG_DVDNAV #include "stream/stream_dvdnav.h" -#endif #include "libmpcodecs/dec_audio.h" #include "libmpcodecs/dec_video.h" |