April 2014 - MPlayer-cvslog - lists.mplayerhq.hu

r37139 - trunk/stream/stream.c
by reimar 06 Apr '14

06 Apr '14

Author: reimar Date: Sun Apr 6 20:53:46 2014 New Revision: 37139 Log: stream: Move variables into lowest possible scope. Modified: trunk/stream/stream.c Modified: trunk/stream/stream.c ============================================================================== --- trunk/stream/stream.c Sun Apr 6 20:48:45 2014 (r37138) +++ trunk/stream/stream.c Sun Apr 6 20:53:46 2014 (r37139) @@ -219,19 +219,19 @@ static stream_t* open_stream_plugin(cons stream_t* open_stream_full(const char* filename,int mode, char** options, int* file_format) { - int i,j,l,r; - const stream_info_t* sinfo; - stream_t* s; - char *redirected_url = NULL; + int i,j; for(i = 0 ; auto_open_streams[i] ; i++) { - sinfo = auto_open_streams[i]; + const stream_info_t *sinfo = auto_open_streams[i]; for(j = 0 ; sinfo->protocols[j] ; j++) { - l = strlen(sinfo->protocols[j]); + int l = strlen(sinfo->protocols[j]); // l == 0 => Don't do protocol matching (ie network and filenames) if((l == 0 && !strstr(filename, "://")) || ((strncasecmp(sinfo->protocols[j],filename,l) == 0) && (strncmp("://",filename+l,3) == 0))) { + int r; + char *redirected_url = NULL; + stream_t* s; *file_format = DEMUXER_TYPE_UNKNOWN; s = open_stream_plugin(sinfo,filename,mode,options,file_format,&r, &redirected_url);

1 0

r37138 - trunk/stream/stream_cddb.c
by reimar 06 Apr '14

06 Apr '14

Author: reimar Date: Sun Apr 6 20:48:45 2014 New Revision: 37138 Log: cddb: Fix memleak in error case. Modified: trunk/stream/stream_cddb.c Modified: trunk/stream/stream_cddb.c ============================================================================== --- trunk/stream/stream_cddb.c Sun Apr 6 20:46:45 2014 (r37137) +++ trunk/stream/stream_cddb.c Sun Apr 6 20:48:45 2014 (r37138) @@ -578,6 +578,7 @@ static int cddb_read_parse(HTTP_header_t // do a sanity check if (http_hdr->body_size < (unsigned int)(ptr2 - ptr)) { mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_MPDEMUX_CDDB_UnexpectedFIXME); + free(ptr); return -1; } cddb_data->xmcd_file = ptr;

1 0

r37137 - trunk/mplayer.c
by reimar 06 Apr '14

06 Apr '14

Author: reimar Date: Sun Apr 6 20:46:45 2014 New Revision: 37137 Log: mplayer: Fix potential NULL dereference. Modified: trunk/mplayer.c Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c Sun Apr 6 20:42:45 2014 (r37136) +++ trunk/mplayer.c Sun Apr 6 20:46:45 2014 (r37137) @@ -548,7 +548,7 @@ static void print_file_properties(const mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_START_TIME=%.2f\n", start_pts); else mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_START_TIME=unknown\n"); - mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_LENGTH=%.2f\n", demuxer_get_time_length(mpctx->demuxer)); + mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_LENGTH=%.2f\n", mpctx->demuxer ? demuxer_get_time_length(mpctx->demuxer) : 0); mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SEEKABLE=%d\n", mpctx->stream->seek && (!mpctx->demuxer || mpctx->demuxer->seekable)); if (mpctx->demuxer) {

1 0

r37136 - trunk/libmpdemux/demux_rawdv.c
by reimar 06 Apr '14

06 Apr '14

Author: reimar Date: Sun Apr 6 20:42:45 2014 New Revision: 37136 Log: rawdv: check for dv_decoder_new failure. Modified: trunk/libmpdemux/demux_rawdv.c Modified: trunk/libmpdemux/demux_rawdv.c ============================================================================== --- trunk/libmpdemux/demux_rawdv.c Sun Apr 6 20:37:42 2014 (r37135) +++ trunk/libmpdemux/demux_rawdv.c Sun Apr 6 20:42:45 2014 (r37136) @@ -157,6 +157,8 @@ static demuxer_t* demux_open_rawdv(demux //read params from this frame dv_decoder=dv_decoder_new(TRUE,TRUE,FALSE); + if (!dv_decoder) + goto err_out; dv_decoder->quality=DV_QUALITY_BEST; if (dv_parse_header(dv_decoder, dv_frame) == -1)

1 0

r37135 - trunk/libvo/vo_tdfx_vid.c
by reimar 06 Apr '14

06 Apr '14

Author: reimar Date: Sun Apr 6 20:37:42 2014 New Revision: 37135 Log: Comment switch fallthrough cases. Modified: trunk/libvo/vo_tdfx_vid.c Modified: trunk/libvo/vo_tdfx_vid.c ============================================================================== --- trunk/libvo/vo_tdfx_vid.c Sun Apr 6 20:36:32 2014 (r37134) +++ trunk/libvo/vo_tdfx_vid.c Sun Apr 6 20:37:42 2014 (r37135) @@ -267,6 +267,7 @@ config(uint32_t width, uint32_t height, case IMGFMT_BGR32: if(use_overlay) mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_TDFXVID_NonNativeOverlayFormatNeedConversion); + /* Fallthrough */ case IMGFMT_BGR15: case IMGFMT_BGR16: src_bpp = (IMGFMT_BGR_DEPTH(format)+7)/8; @@ -277,6 +278,7 @@ config(uint32_t width, uint32_t height, buffer_stride[0] = ((src_width+1)/2)*2; buffer_stride[1] = buffer_stride[2] = buffer_stride[0]/2; src_fmt = TDFX_VID_FORMAT_YUY2; + /* TODO: is src_bpp == 2 really correct?? */ case IMGFMT_YUY2: case IMGFMT_UYVY: src_bpp = 2;

1 0

r37134 - trunk/libvo/vo_tdfx_vid.c
by reimar 06 Apr '14

06 Apr '14

Author: reimar Date: Sun Apr 6 20:36:32 2014 New Revision: 37134 Log: Use macro to get BGR format bit depth. Modified: trunk/libvo/vo_tdfx_vid.c Modified: trunk/libvo/vo_tdfx_vid.c ============================================================================== --- trunk/libvo/vo_tdfx_vid.c Sun Apr 6 20:27:49 2014 (r37133) +++ trunk/libvo/vo_tdfx_vid.c Sun Apr 6 20:36:32 2014 (r37134) @@ -269,7 +269,7 @@ config(uint32_t width, uint32_t height, mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_TDFXVID_NonNativeOverlayFormatNeedConversion); case IMGFMT_BGR15: case IMGFMT_BGR16: - src_bpp = ((format & 0x3F)+7)/8; + src_bpp = (IMGFMT_BGR_DEPTH(format)+7)/8; break; case IMGFMT_YV12: case IMGFMT_I420:

1 0

r37133 - trunk/libmpcodecs/mp_image.c
by reimar 06 Apr '14

06 Apr '14

Author: reimar Date: Sun Apr 6 20:27:49 2014 New Revision: 37133 Log: Minor spelling/grammar fixes. Modified: trunk/libmpcodecs/mp_image.c Modified: trunk/libmpcodecs/mp_image.c ============================================================================== --- trunk/libmpcodecs/mp_image.c Sun Apr 6 20:23:25 2014 (r37132) +++ trunk/libmpcodecs/mp_image.c Sun Apr 6 20:27:49 2014 (r37133) @@ -240,7 +240,7 @@ mp_image_t* new_mp_image(int w,int h){ void free_mp_image(mp_image_t* mpi){ if(!mpi) return; if(mpi->flags&MP_IMGFLAG_ALLOCATED){ - /* becouse we allocate the whole image in once */ + /* because we allocate the whole image at once */ av_free(mpi->planes[0]); if (mpi->flags & MP_IMGFLAG_RGB_PALETTE) av_free(mpi->planes[1]);

1 0

r37132 - trunk/input/joystick.c
by reimar 06 Apr '14

06 Apr '14

Author: reimar Date: Sun Apr 6 20:23:25 2014 New Revision: 37132 Log: joystick: Fix incorrect pointer offset code. I have some doubts that short reads are even allowed/ possible for /dev/js*, does someone know for sure? Modified: trunk/input/joystick.c Modified: trunk/input/joystick.c ============================================================================== --- trunk/input/joystick.c Sun Apr 6 20:18:01 2014 (r37131) +++ trunk/input/joystick.c Sun Apr 6 20:23:25 2014 (r37132) @@ -95,7 +95,7 @@ int mp_input_joystick_read(int fd) { int l=0; while((unsigned int)l < sizeof(struct js_event)) { - int r = read(fd,&ev+l,sizeof(struct js_event)-l); + int r = read(fd,((char*)&ev)+l,sizeof(struct js_event)-l); if(r <= 0) { if(errno == EINTR) continue;

1 0

r37131 - trunk/libmpcodecs/ae_twolame.c
by reimar 06 Apr '14

06 Apr '14

Author: reimar Date: Sun Apr 6 20:18:01 2014 New Revision: 37131 Log: ae_towlame: Remove pointless context size print. It used an incorrect format string, sizeof() is not always an int. Modified: trunk/libmpcodecs/ae_twolame.c Modified: trunk/libmpcodecs/ae_twolame.c ============================================================================== --- trunk/libmpcodecs/ae_twolame.c Sun Apr 6 20:13:47 2014 (r37130) +++ trunk/libmpcodecs/ae_twolame.c Sun Apr 6 20:18:01 2014 (r37131) @@ -168,7 +168,7 @@ int mpae_init_twolame(audio_encoder_t *e ctx = calloc(1, sizeof(mpae_twolame_ctx)); if(ctx == NULL) { - mp_msg(MSGT_MENCODER, MSGL_ERR, "ae_twolame, couldn't alloc a %d bytes context, exiting\n", sizeof(mpae_twolame_ctx)); + mp_msg(MSGT_MENCODER, MSGL_ERR, "ae_twolame, couldn't alloc context, exiting\n"); return 0; }

1 0

r37130 - trunk/vidix/radeon_vid.c
by reimar 06 Apr '14

06 Apr '14

Author: reimar Date: Sun Apr 6 20:13:47 2014 New Revision: 37130 Log: vidix: fix bad shift. Shifting an int left by 32 is undefined. Since it's not performance-critical, just do a 64 bit shift instead. Modified: trunk/vidix/radeon_vid.c Modified: trunk/vidix/radeon_vid.c ============================================================================== --- trunk/vidix/radeon_vid.c Sun Apr 6 20:10:31 2014 (r37129) +++ trunk/vidix/radeon_vid.c Sun Apr 6 20:13:47 2014 (r37130) @@ -3394,7 +3394,7 @@ static int set_gr_key( void ) besr.graphics_key_clr=0; } #ifdef RAGE128 - besr.graphics_key_msk=(1<<dbpp)-1; + besr.graphics_key_msk=(1ull<<dbpp)-1; besr.ckey_cntl = VIDEO_KEY_FN_TRUE|GRAPHIC_KEY_FN_NE|CMP_MIX_AND; #else besr.graphics_key_msk=besr.graphics_key_clr;

1 0