Mercurial > libavformat.hg
changeset 3278:1de87c1b6a12 libavformat
Remove unnecessary parentheses from return calls.
| author | diego |
|---|---|
| date | Tue, 06 May 2008 09:16:36 +0000 |
| parents | ce8070648576 |
| children | 807c5f54e8b5 |
| files | bethsoftvid.c dv.c gif.c movenc.c mp3.c mpegts.c mtv.c rtsp.c utils.c |
| diffstat | 9 files changed, 11 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/bethsoftvid.c Mon May 05 09:17:56 2008 +0000 +++ b/bethsoftvid.c Tue May 06 09:16:36 2008 +0000 @@ -202,7 +202,7 @@ audio_length = get_le16(pb); ret_value = av_get_packet(pb, pkt, audio_length); pkt->stream_index = 1; - return (ret_value != audio_length ? AVERROR(EIO) : ret_value); + return ret_value != audio_length ? AVERROR(EIO) : ret_value; case VIDEO_P_FRAME: case VIDEO_YOFF_P_FRAME:
--- a/dv.c Mon May 05 09:17:56 2008 +0000 +++ b/dv.c Tue May 06 09:16:36 2008 +0000 @@ -87,7 +87,7 @@ return NULL; } - return (frame[offs] == t ? &frame[offs] : NULL); + return frame[offs] == t ? &frame[offs] : NULL; } /*
--- a/gif.c Mon May 05 09:17:56 2008 +0000 +++ b/gif.c Tue May 06 09:16:36 2008 +0000 @@ -236,7 +236,7 @@ /* this is maybe slow, but allows for extensions */ static inline unsigned char gif_clut_index(uint8_t r, uint8_t g, uint8_t b) { - return ((((r)/47)%6)*6*6+(((g)/47)%6)*6+(((b)/47)%6)); + return (((r) / 47) % 6) * 6 * 6 + (((g) / 47) % 6) * 6 + (((b) / 47) % 6); }
--- a/movenc.c Mon May 05 09:17:56 2008 +0000 +++ b/movenc.c Tue May 06 09:16:36 2008 +0000 @@ -1247,7 +1247,7 @@ static uint16_t language_code (const char *str) { - return ((((str[0]-0x60) & 0x1F)<<10) + (((str[1]-0x60) & 0x1F)<<5) + ((str[2]-0x60) & 0x1F)); + return (((str[0]-0x60) & 0x1F) << 10) + (((str[1]-0x60) & 0x1F) << 5) + ((str[2]-0x60) & 0x1F); } static int mov_write_uuidusmt_tag (ByteIOContext *pb, AVFormatContext *s)
--- a/mp3.c Mon May 05 09:17:56 2008 +0000 +++ b/mp3.c Tue May 06 09:16:36 2008 +0000 @@ -160,7 +160,7 @@ /* buf must be ID3v2_HEADER_SIZE byte long */ static int id3v2_match(const uint8_t *buf) { - return (buf[0] == 'I' && + return buf[0] == 'I' && buf[1] == 'D' && buf[2] == '3' && buf[3] != 0xff && @@ -168,7 +168,7 @@ (buf[6] & 0x80) == 0 && (buf[7] & 0x80) == 0 && (buf[8] & 0x80) == 0 && - (buf[9] & 0x80) == 0); + (buf[9] & 0x80) == 0; } static unsigned int id3v2_get_size(ByteIOContext *s, int len)
--- a/mpegts.c Mon May 05 09:17:56 2008 +0000 +++ b/mpegts.c Tue May 06 09:16:36 2008 +0000 @@ -227,7 +227,7 @@ } } - return (!used && discarded); + return !used && discarded; } /**
--- a/mtv.c Mon May 05 09:17:56 2008 +0000 +++ b/mtv.c Tue May 06 09:16:36 2008 +0000 @@ -124,7 +124,7 @@ if(url_fseek(pb, MTV_HEADER_SIZE, SEEK_SET) != MTV_HEADER_SIZE) return AVERROR(EIO); - return(0); + return 0; } @@ -171,7 +171,7 @@ pkt->stream_index = VIDEO_SID; } - return(ret); + return ret; } AVInputFormat mtv_demuxer = {
--- a/rtsp.c Mon May 05 09:17:56 2008 +0000 +++ b/rtsp.c Tue May 06 09:16:36 2008 +0000 @@ -90,7 +90,7 @@ static int redir_isspace(int c) { - return (c == ' ' || c == '\t' || c == '\n' || c == '\r'); + return c == ' ' || c == '\t' || c == '\n' || c == '\r'; } static void skip_spaces(const char **pp)
--- a/utils.c Mon May 05 09:17:56 2008 +0000 +++ b/utils.c Tue May 06 09:16:36 2008 +0000 @@ -1690,7 +1690,7 @@ val = 1; break; } - return (enc->codec_id != CODEC_ID_NONE && val != 0); + return enc->codec_id != CODEC_ID_NONE && val != 0; } static int try_decode_frame(AVStream *st, const uint8_t *data, int size)