diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2011-07-07 23:41:42 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@mplayer2.org> | 2011-07-09 04:23:24 +0300 |
| commit | 2174cbfa2fd153e7a77ba5ef7167d2bf99057330 (patch) | |
| tree | f22f58f4a272b99d22b939fcd4fdeb27198680a5 /libmpdemux | |
| parent | 6794bca0e96ac288eab7248431080afe29152564 (diff) | |
| download | mpv-2174cbfa2fd153e7a77ba5ef7167d2bf99057330.tar.bz2 mpv-2174cbfa2fd153e7a77ba5ef7167d2bf99057330.tar.xz | |
cleanup: silence most of the clang warnings
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_asf.c | 4 | ||||
| -rw-r--r-- | libmpdemux/demux_lavf.c | 2 | ||||
| -rw-r--r-- | libmpdemux/demux_ts.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/libmpdemux/demux_asf.c b/libmpdemux/demux_asf.c index 5c79774da7..c10fd3e14b 100644 --- a/libmpdemux/demux_asf.c +++ b/libmpdemux/demux_asf.c @@ -468,8 +468,8 @@ static int demux_asf_fill_buffer(demuxer_t *demux, demux_stream_t *ds){ rlen = read_varlen(&p, segtype, 0); // printf("### rlen=%d \n",rlen); - if (rlen < 0 || rlen > p_end - p) { - mp_msg(MSGT_DEMUX, MSGL_V, "invalid rlen=%d\n", rlen); + if (rlen > p_end - p) { + mp_msg(MSGT_DEMUX, MSGL_V, "invalid rlen=%u\n", rlen); break; } diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index efda65a14d..0b8c9190a4 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -144,7 +144,7 @@ static void list_formats(void) { mp_msg(MSGT_DEMUX, MSGL_INFO, "Available lavf input formats:\n"); AVInputFormat *fmt = NULL; - while (fmt = av_iformat_next(fmt)) + while ((fmt = av_iformat_next(fmt))) mp_msg(MSGT_DEMUX, MSGL_INFO, "%15s : %s\n", fmt->name, fmt->long_name); } diff --git a/libmpdemux/demux_ts.c b/libmpdemux/demux_ts.c index 6658e3b796..15c2613dc6 100644 --- a/libmpdemux/demux_ts.c +++ b/libmpdemux/demux_ts.c @@ -1549,7 +1549,7 @@ static int pes_parse2(unsigned char *buf, uint16_t packet_len, ES_stream_t *es, return 1; } } - else if(((stream_id >= 0xe0) && (stream_id <= 0xef)) || (stream_id == 0xfd && type_from_pmt != UNKNOWN)) + else if((stream_id >= 0xe0 && stream_id <= 0xef) || (stream_id == 0xfd && type_from_pmt != UNKNOWN)) { es->start = p; es->size = packet_len; @@ -1563,7 +1563,7 @@ static int pes_parse2(unsigned char *buf, uint16_t packet_len, ES_stream_t *es, mp_msg(MSGT_DEMUX, MSGL_DBG2, "pes_parse2: M2V size %d\n", es->size); return 1; } - else if ((stream_id == 0xfa)) + else if (stream_id == 0xfa) { int l; |