diff options
| -rw-r--r-- | libmpdemux/aviheader.c | 2 | ||||
| -rw-r--r-- | libmpdemux/demux_ts.c | 3 | ||||
| -rw-r--r-- | libmpdemux/mpeg_hdr.c | 9 | ||||
| -rw-r--r-- | libvo/vo_dfbmga.c | 4 | ||||
| -rw-r--r-- | libvo/vo_directfb2.c | 4 |
5 files changed, 9 insertions, 13 deletions
diff --git a/libmpdemux/aviheader.c b/libmpdemux/aviheader.c index cd2db91726..3f18af28f8 100644 --- a/libmpdemux/aviheader.c +++ b/libmpdemux/aviheader.c @@ -258,7 +258,7 @@ while(1){ s->aIndex[i].dwSize = stream_read_dword_le(demuxer->stream); s->aIndex[i].dwDuration = stream_read_dword_le(demuxer->stream); mp_msg (MSGT_HEADER, MSGL_V, "ODML (%.4s): [%d] 0x%016"PRIx64" 0x%04x %u\n", - (s->dwChunkId), i, + s->dwChunkId, i, (uint64_t)s->aIndex[i].qwOffset, s->aIndex[i].dwSize, s->aIndex[i].dwDuration); } diff --git a/libmpdemux/demux_ts.c b/libmpdemux/demux_ts.c index ebb1709f5a..d809ac6c3b 100644 --- a/libmpdemux/demux_ts.c +++ b/libmpdemux/demux_ts.c @@ -661,7 +661,7 @@ static int a52_check(char *buf, int len) static off_t ts_detect_streams(demuxer_t *demuxer, tsdemux_init_t *param) { - int video_found = 0, audio_found = 0, sub_found av_unused = 0, i, num_packets = 0, req_apid, req_vpid, req_spid; + int video_found = 0, audio_found = 0, i, num_packets = 0, req_apid, req_vpid, req_spid; int is_audio, is_video, is_sub, has_tables; int32_t p, chosen_pid = 0; off_t pos=0, ret = 0, init_pos, end_pos; @@ -828,7 +828,6 @@ static off_t ts_detect_streams(demuxer_t *demuxer, tsdemux_init_t *param) { param->stype = es.type; param->spid = es.pid; - sub_found = 1; } } diff --git a/libmpdemux/mpeg_hdr.c b/libmpdemux/mpeg_hdr.c index 2a00727e3a..0c368aa7a2 100644 --- a/libmpdemux/mpeg_hdr.c +++ b/libmpdemux/mpeg_hdr.c @@ -45,7 +45,7 @@ static float frameratecode2framerate[16] = { int mp_header_process_sequence_header (mp_mpeg_header_t * picture, const unsigned char * buffer) { - int width av_unused, height; + int height; if ((buffer[6] & 0x20) != 0x20){ fprintf(stderr, "missing marker bit!\n"); @@ -54,11 +54,8 @@ int mp_header_process_sequence_header (mp_mpeg_header_t * picture, const unsigne height = (buffer[0] << 16) | (buffer[1] << 8) | buffer[2]; - picture->display_picture_width = (height >> 12); - picture->display_picture_height = (height & 0xfff); - - width = ((height >> 12) + 15) & ~15; - height = ((height & 0xfff) + 15) & ~15; + picture->display_picture_width = height >> 12; + picture->display_picture_height = height & 0xfff; picture->aspect_ratio_information = buffer[3] >> 4; picture->frame_rate_code = buffer[3] & 15; diff --git a/libvo/vo_dfbmga.c b/libvo/vo_dfbmga.c index 76ae4a46f9..57b798040e 100644 --- a/libvo/vo_dfbmga.c +++ b/libvo/vo_dfbmga.c @@ -1335,7 +1335,7 @@ draw_image( mp_image_t *mpi ) } static int -set_equalizer( char *data, int value ) +set_equalizer( const char *data, int value ) { DFBResult res; DFBColorAdjustment ca; @@ -1375,7 +1375,7 @@ set_equalizer( char *data, int value ) } static int -get_equalizer( char *data, int *value ) +get_equalizer( const char *data, int *value ) { DFBResult res; DFBColorAdjustment ca; diff --git a/libvo/vo_directfb2.c b/libvo/vo_directfb2.c index de44b2ea51..ae15918b53 100644 --- a/libvo/vo_directfb2.c +++ b/libvo/vo_directfb2.c @@ -980,7 +980,7 @@ static void uninit(void) } -static uint32_t directfb_set_video_eq(char *data, int value) //data==name +static uint32_t directfb_set_video_eq(const char *data, int value) //data==name { DFBColorAdjustment ca; @@ -1038,7 +1038,7 @@ if (layer) { } -static uint32_t directfb_get_video_eq(char *data, int *value) // data==name +static uint32_t directfb_get_video_eq(const char *data, int *value) // data==name { DFBColorAdjustment ca; |