diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2011-07-02 22:59:40 +0000 |
|---|---|---|
| committer | Uoti Urpala <uau@mplayer2.org> | 2011-07-06 13:01:08 +0300 |
| commit | 06d830687d5c57f7d5016ae4d0fccaa7b6780bad (patch) | |
| tree | 1dff2121cd16c785cb3eeb5cc61bf9b71e932e14 | |
| parent | 684e54587e78d09426fcd9680ca4eb5eb2672d69 (diff) | |
| download | mpv-06d830687d5c57f7d5016ae4d0fccaa7b6780bad.tar.bz2 mpv-06d830687d5c57f7d5016ae4d0fccaa7b6780bad.tar.xz | |
cleanup: silence some clang warnings
Cosmetics: vo_mpegpes.c: Fix strange space placement
Avoids clang warning that =- might have been intended as -=.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33797 b3059339-0415-0410-9bf9-f77b7e298cf2
vo_jpeg: Use "const char *" type for paths.
Fixes a clang warning due to sign mismatch when calling open().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33799 b3059339-0415-0410-9bf9-f77b7e298cf2
mga_template.c: Remove pointless and in addition incorrect cast.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33800 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | libvo/mga_template.c | 2 | ||||
| -rw-r--r-- | libvo/vo_jpeg.c | 4 | ||||
| -rw-r--r-- | libvo/vo_mpegpes.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/libvo/mga_template.c b/libvo/mga_template.c index bd71694326..6886ecd8f7 100644 --- a/libvo/mga_template.c +++ b/libvo/mga_template.c @@ -438,7 +438,7 @@ static int mga_init(int width,int height,unsigned int format){ mp_msg(MSGT_VO,MSGL_V,"[MGA] Using %d buffers.\n",mga_vid_config.num_frames); - frames[0] = (char*)mmap(0,mga_vid_config.frame_size*mga_vid_config.num_frames,PROT_WRITE,MAP_SHARED,f,0); + frames[0] = mmap(0,mga_vid_config.frame_size*mga_vid_config.num_frames,PROT_WRITE,MAP_SHARED,f,0); frames[1] = frames[0] + 1*mga_vid_config.frame_size; frames[2] = frames[0] + 2*mga_vid_config.frame_size; frames[3] = frames[0] + 3*mga_vid_config.frame_size; diff --git a/libvo/vo_jpeg.c b/libvo/vo_jpeg.c index cafaf1f2d4..15f29a293a 100644 --- a/libvo/vo_jpeg.c +++ b/libvo/vo_jpeg.c @@ -104,7 +104,7 @@ static int framenum = 0; * returns, everything went well. */ -static void jpeg_mkdir(char *buf, int verbose) { +static void jpeg_mkdir(const char *buf, int verbose) { struct stat stat_p; #ifndef __MINGW32__ @@ -176,7 +176,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, /* ------------------------------------------------------------------------- */ -static uint32_t jpeg_write(uint8_t * name, uint8_t * buffer) +static uint32_t jpeg_write(const char * name, uint8_t * buffer) { FILE *outfile; struct jpeg_compress_struct cinfo; diff --git a/libvo/vo_mpegpes.c b/libvo/vo_mpegpes.c index dc63579519..cae6278e8f 100644 --- a/libvo/vo_mpegpes.c +++ b/libvo/vo_mpegpes.c @@ -232,7 +232,7 @@ static void uninit(void) { if(ao_mpegpes_fd >= 0 && ao_mpegpes_fd != vo_mpegpes_fd) close(ao_mpegpes_fd); - ao_mpegpes_fd =- 1; + ao_mpegpes_fd = -1; if(vo_mpegpes_fd>=0){ close(vo_mpegpes_fd);vo_mpegpes_fd=-1;} } |