diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-21 15:03:49 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-21 15:03:49 +0300 |
| commit | 2d4656e070697cebe8cb66568b3e8dd8919b5eed (patch) | |
| tree | 39c927d18e0ab459c7ddf36dcb876d2d0621e2a6 /stream | |
| parent | 92f0cba26b5c032f8b097f525862233d92a02a2d (diff) | |
| parent | 4993d0c46afa109c3deb8d818be712ec86e0230a (diff) | |
| download | mpv-2d4656e070697cebe8cb66568b3e8dd8919b5eed.tar.bz2 mpv-2d4656e070697cebe8cb66568b3e8dd8919b5eed.tar.xz | |
Merge svn changes up to r27332
Diffstat (limited to 'stream')
| -rw-r--r-- | stream/ai_alsa.c | 1 | ||||
| -rw-r--r-- | stream/ai_alsa1x.c | 1 | ||||
| -rw-r--r-- | stream/stream_cddb.c | 2 | ||||
| -rw-r--r-- | stream/vcd_read.h | 8 |
4 files changed, 7 insertions, 5 deletions
diff --git a/stream/ai_alsa.c b/stream/ai_alsa.c index a1468bed09..84d0aa58a4 100644 --- a/stream/ai_alsa.c +++ b/stream/ai_alsa.c @@ -1,6 +1,7 @@ #include <stdio.h> #include <stdlib.h> #include <sys/time.h> +#include <alloca.h> #include "config.h" diff --git a/stream/ai_alsa1x.c b/stream/ai_alsa1x.c index 455c64191f..aab42e397b 100644 --- a/stream/ai_alsa1x.c +++ b/stream/ai_alsa1x.c @@ -1,6 +1,7 @@ #include <stdio.h> #include <stdlib.h> #include <sys/time.h> +#include <alloca.h> #include "config.h" diff --git a/stream/stream_cddb.c b/stream/stream_cddb.c index 2f177eb7bd..ff12d94c17 100644 --- a/stream/stream_cddb.c +++ b/stream/stream_cddb.c @@ -390,7 +390,7 @@ cddb_write_cache(cddb_data_t *cddb_data) { sprintf( file_name, "%s%08lx", cddb_data->cache_dir, cddb_data->disc_id ); - file_fd = creat(file_name, S_IREAD|S_IWRITE); + file_fd = creat(file_name, S_IRUSR|S_IWUSR); if( file_fd<0 ) { perror("create"); return -1; diff --git a/stream/vcd_read.h b/stream/vcd_read.h index 9cf46fce25..177316ecae 100644 --- a/stream/vcd_read.h +++ b/stream/vcd_read.h @@ -9,11 +9,11 @@ #include "stream.h" #include "libavutil/intreadwrite.h" //=================== VideoCD ========================== -#if defined(linux) || defined(sun) || defined(__bsdi__) +#if defined(__linux__) || defined(sun) || defined(__bsdi__) typedef struct mp_vcd_priv_st mp_vcd_priv_t; -#if defined(linux) +#if defined(__linux__) #include <linux/cdrom.h> #elif defined(sun) #include <sys/cdio.h> @@ -128,7 +128,7 @@ mp_vcd_priv_t* vcd_read_toc(int fd){ } static int vcd_read(mp_vcd_priv_t* vcd,char *mem){ -#if defined(linux) || defined(__bsdi__) +#if defined(__linux__) || defined(__bsdi__) memcpy(vcd->buf,&vcd->entry.cdte_addr.msf,sizeof(struct cdrom_msf)); if(ioctl(vcd->fd,CDROMREADRAW,vcd->buf)==-1) return 0; // EOF? memcpy(mem,&vcd->buf[VCD_SECTOR_OFFS],VCD_SECTOR_DATA); @@ -225,7 +225,7 @@ static int sun_vcd_read(mp_vcd_priv_t* vcd, int *offset) } #endif /*sun*/ -#else /* linux || sun || __bsdi__ */ +#else /* __linux__ || sun || __bsdi__ */ #error vcd is not yet supported on this arch... |