diff options
author | Diego Biurrun <diego@biurrun.de> | 2008-05-06 13:16:36 +0400 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2008-05-06 13:16:36 +0400 |
commit | ccd425e7993ef0e76da7bf10c566d33f7acc7c6d (patch) | |
tree | 29a2af2f8eb50c22d5b23cca7763d9d507273cab /libavformat | |
parent | 91605c69fb79bc37e7b8ae756b42bbe1f3cf5423 (diff) |
Remove unnecessary parentheses from return calls.
Originally committed as revision 13069 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/bethsoftvid.c | 2 | ||||
-rw-r--r-- | libavformat/dv.c | 2 | ||||
-rw-r--r-- | libavformat/gif.c | 2 | ||||
-rw-r--r-- | libavformat/movenc.c | 2 | ||||
-rw-r--r-- | libavformat/mp3.c | 4 | ||||
-rw-r--r-- | libavformat/mpegts.c | 2 | ||||
-rw-r--r-- | libavformat/mtv.c | 4 | ||||
-rw-r--r-- | libavformat/rtsp.c | 2 | ||||
-rw-r--r-- | libavformat/utils.c | 2 |
9 files changed, 11 insertions, 11 deletions
diff --git a/libavformat/bethsoftvid.c b/libavformat/bethsoftvid.c index 594779698b..9b04d3fbe0 100644 --- a/libavformat/bethsoftvid.c +++ b/libavformat/bethsoftvid.c @@ -202,7 +202,7 @@ static int vid_read_packet(AVFormatContext *s, 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: diff --git a/libavformat/dv.c b/libavformat/dv.c index 6fb27bfe06..0f4c5cf0b4 100644 --- a/libavformat/dv.c +++ b/libavformat/dv.c @@ -87,7 +87,7 @@ static const uint8_t* dv_extract_pack(uint8_t* frame, enum dv_pack_type t) return NULL; } - return (frame[offs] == t ? &frame[offs] : NULL); + return frame[offs] == t ? &frame[offs] : NULL; } /* diff --git a/libavformat/gif.c b/libavformat/gif.c index 7b71faea93..b952fbe697 100644 --- a/libavformat/gif.c +++ b/libavformat/gif.c @@ -236,7 +236,7 @@ static int gif_image_write_header(ByteIOContext *pb, /* 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); } diff --git a/libavformat/movenc.c b/libavformat/movenc.c index b5b4da95f5..5ded25076e 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1247,7 +1247,7 @@ static int ascii_to_wc (ByteIOContext *pb, const uint8_t *b) 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) diff --git a/libavformat/mp3.c b/libavformat/mp3.c index 64e0ce285a..1b3ff011f6 100644 --- a/libavformat/mp3.c +++ b/libavformat/mp3.c @@ -160,7 +160,7 @@ static const char *id3v1_genre_str[ID3v1_GENRE_MAX + 1] = { /* 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 @@ static int id3v2_match(const uint8_t *buf) (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) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 9407dae138..6cb4bcab4f 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -227,7 +227,7 @@ static int discard_pid(MpegTSContext *ts, unsigned int pid) } } - return (!used && discarded); + return !used && discarded; } /** diff --git a/libavformat/mtv.c b/libavformat/mtv.c index 32057e6236..6db0d67bbb 100644 --- a/libavformat/mtv.c +++ b/libavformat/mtv.c @@ -124,7 +124,7 @@ static int mtv_read_header(AVFormatContext *s, AVFormatParameters *ap) if(url_fseek(pb, MTV_HEADER_SIZE, SEEK_SET) != MTV_HEADER_SIZE) return AVERROR(EIO); - return(0); + return 0; } @@ -171,7 +171,7 @@ static int mtv_read_packet(AVFormatContext *s, AVPacket *pkt) pkt->stream_index = VIDEO_SID; } - return(ret); + return ret; } AVInputFormat mtv_demuxer = { diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 5064865f12..d5c694ac77 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -90,7 +90,7 @@ static int rtsp_probe(AVProbeData *p) 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) diff --git a/libavformat/utils.c b/libavformat/utils.c index 530a9bb16a..5d164c5d5a 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1690,7 +1690,7 @@ static int has_codec_parameters(AVCodecContext *enc) 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) |