[FFmpeg-cvslog] r13069 - in trunk: libavcodec/imgconvert.c libavcodec/libamr.c libavcodec/loco.c libavcodec/pcm.c libavcodec/pnm.c libavcodec/ppc/check_altivec.c libavcodec/rv34.c libavcodec/svq1enc.c libavcodec/truemotion1.c libavcodec/truemotion2.c libavcodec/vmdav.c libavcodec/vorbis.c libavformat/bethsoftvid.c libavformat/dv.c libavformat/gif.c libavformat/movenc.c libavformat/mp3.c libavformat/mpegts.c libavformat/mtv.c libavformat/rtsp.c libavformat/utils.c libavutil/base64.c
diego
subversion
Tue May 6 11:16:37 CEST 2008
Author: diego
Date: Tue May 6 11:16:36 2008
New Revision: 13069
Log:
Remove unnecessary parentheses from return calls.
Modified:
trunk/libavcodec/imgconvert.c
trunk/libavcodec/libamr.c
trunk/libavcodec/loco.c
trunk/libavcodec/pcm.c
trunk/libavcodec/pnm.c
trunk/libavcodec/ppc/check_altivec.c
trunk/libavcodec/rv34.c
trunk/libavcodec/svq1enc.c
trunk/libavcodec/truemotion1.c
trunk/libavcodec/truemotion2.c
trunk/libavcodec/vmdav.c
trunk/libavcodec/vorbis.c
trunk/libavformat/bethsoftvid.c
trunk/libavformat/dv.c
trunk/libavformat/gif.c
trunk/libavformat/movenc.c
trunk/libavformat/mp3.c
trunk/libavformat/mpegts.c
trunk/libavformat/mtv.c
trunk/libavformat/rtsp.c
trunk/libavformat/utils.c
trunk/libavutil/base64.c
Modified: trunk/libavcodec/imgconvert.c
==============================================================================
--- trunk/libavcodec/imgconvert.c (original)
+++ trunk/libavcodec/imgconvert.c Tue May 6 11:16:36 2008
@@ -1362,7 +1362,7 @@ void ff_shrink88(uint8_t *dst, int dst_w
/* 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);
}
static void build_rgb_palette(uint8_t *palette, int has_alpha)
Modified: trunk/libavcodec/libamr.c
==============================================================================
--- trunk/libavcodec/libamr.c (original)
+++ trunk/libavcodec/libamr.c Tue May 6 11:16:36 2008
@@ -112,7 +112,7 @@ static int getBitrateMode(int bitrate)
{
if(rates[i].rate==bitrate)
{
- return(rates[i].mode);
+ return rates[i].mode;
}
}
/* no bitrate matching, return an error */
@@ -559,7 +559,7 @@ static int getWBBitrateMode(int bitrate)
{
if(rates[i].rate==bitrate)
{
- return(rates[i].mode);
+ return rates[i].mode;
}
}
/* no bitrate matching, return an error */
Modified: trunk/libavcodec/loco.c
==============================================================================
--- trunk/libavcodec/loco.c (original)
+++ trunk/libavcodec/loco.c Tue May 6 11:16:36 2008
@@ -152,7 +152,7 @@ static int loco_decode_plane(LOCOContext
data += stride;
}
- return ((get_bits_count(&rc.gb) + 7) >> 3);
+ return (get_bits_count(&rc.gb) + 7) >> 3;
}
static int decode_frame(AVCodecContext *avctx,
Modified: trunk/libavcodec/pcm.c
==============================================================================
--- trunk/libavcodec/pcm.c (original)
+++ trunk/libavcodec/pcm.c Tue May 6 11:16:36 2008
@@ -56,7 +56,7 @@ static av_cold int alaw2linear(unsigned
if(seg) t= (t + t + 1 + 32) << (seg + 2);
else t= (t + t + 1 ) << 3;
- return ((a_val & SIGN_BIT) ? t : -t);
+ return (a_val & SIGN_BIT) ? t : -t;
}
static av_cold int ulaw2linear(unsigned char u_val)
@@ -73,7 +73,7 @@ static av_cold int ulaw2linear(unsigned
t = ((u_val & QUANT_MASK) << 3) + BIAS;
t <<= ((unsigned)u_val & SEG_MASK) >> SEG_SHIFT;
- return ((u_val & SIGN_BIT) ? (BIAS - t) : (t - BIAS));
+ return (u_val & SIGN_BIT) ? (BIAS - t) : (t - BIAS);
}
/* 16384 entries per table */
Modified: trunk/libavcodec/pnm.c
==============================================================================
--- trunk/libavcodec/pnm.c (original)
+++ trunk/libavcodec/pnm.c Tue May 6 11:16:36 2008
@@ -23,7 +23,7 @@
static inline int pnm_space(int c)
{
- return (c == ' ' || c == '\n' || c == '\r' || c == '\t');
+ return c == ' ' || c == '\n' || c == '\r' || c == '\t';
}
static void pnm_get(PNMContext *sc, char *str, int buf_size)
Modified: trunk/libavcodec/ppc/check_altivec.c
==============================================================================
--- trunk/libavcodec/ppc/check_altivec.c (original)
+++ trunk/libavcodec/ppc/check_altivec.c Tue May 6 11:16:36 2008
@@ -52,7 +52,7 @@ int has_altivec(void)
err = sysctl(sels, 2, &has_vu, &len, NULL, 0);
- if (err == 0) return (has_vu != 0);
+ if (err == 0) return has_vu != 0;
return 0;
#elif defined(RUNTIME_CPUDETECT)
int proc_ver;
Modified: trunk/libavcodec/rv34.c
==============================================================================
--- trunk/libavcodec/rv34.c (original)
+++ trunk/libavcodec/rv34.c Tue May 6 11:16:36 2008
@@ -1186,7 +1186,7 @@ static int rv34_decode_slice(RV34DecCont
}
ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, AC_END|DC_END|MV_END);
- return (s->mb_y == s->mb_height);
+ return s->mb_y == s->mb_height;
}
/** @} */ // recons group end
Modified: trunk/libavcodec/svq1enc.c
==============================================================================
--- trunk/libavcodec/svq1enc.c (original)
+++ trunk/libavcodec/svq1enc.c Tue May 6 11:16:36 2008
@@ -551,7 +551,7 @@ static int svq1_encode_frame(AVCodecCont
flush_put_bits(&s->pb);
- return (put_bits_count(&s->pb) / 8);
+ return put_bits_count(&s->pb) / 8;
}
static av_cold int svq1_encode_end(AVCodecContext *avctx)
Modified: trunk/libavcodec/truemotion1.c
==============================================================================
--- trunk/libavcodec/truemotion1.c (original)
+++ trunk/libavcodec/truemotion1.c Tue May 6 11:16:36 2008
@@ -176,7 +176,7 @@ static int make_ydt15_entry(int p1, int
lo += (lo << 5) + (lo << 10);
hi = ydt[p2];
hi += (hi << 5) + (hi << 10);
- return ((lo + (hi << 16)) << 1);
+ return (lo + (hi << 16)) << 1;
}
#ifdef WORDS_BIGENDIAN
@@ -190,7 +190,7 @@ static int make_cdt15_entry(int p1, int
b = cdt[p2];
r = cdt[p1] << 10;
lo = b + r;
- return ((lo + (lo << 16)) << 1);
+ return (lo + (lo << 16)) << 1;
}
#ifdef WORDS_BIGENDIAN
@@ -205,7 +205,7 @@ static int make_ydt16_entry(int p1, int
lo += (lo << 6) + (lo << 11);
hi = ydt[p2];
hi += (hi << 6) + (hi << 11);
- return ((lo + (hi << 16)) << 1);
+ return (lo + (hi << 16)) << 1;
}
#ifdef WORDS_BIGENDIAN
@@ -219,7 +219,7 @@ static int make_cdt16_entry(int p1, int
b = cdt[p2];
r = cdt[p1] << 11;
lo = b + r;
- return ((lo + (lo << 16)) << 1);
+ return (lo + (lo << 16)) << 1;
}
#ifdef WORDS_BIGENDIAN
@@ -232,7 +232,7 @@ static int make_ydt24_entry(int p1, int
lo = ydt[p1];
hi = ydt[p2];
- return ((lo + (hi << 8) + (hi << 16)) << 1);
+ return (lo + (hi << 8) + (hi << 16)) << 1;
}
#ifdef WORDS_BIGENDIAN
@@ -245,7 +245,7 @@ static int make_cdt24_entry(int p1, int
b = cdt[p2];
r = cdt[p1]<<16;
- return ((b+r) << 1);
+ return (b+r) << 1;
}
static void gen_vector_table15(TrueMotion1Context *s, const uint8_t *sel_vector_table)
Modified: trunk/libavcodec/truemotion2.c
==============================================================================
--- trunk/libavcodec/truemotion2.c (original)
+++ trunk/libavcodec/truemotion2.c Tue May 6 11:16:36 2008
@@ -232,7 +232,7 @@ static inline int tm2_read_header(TM2Con
return -1;
}
- return (buf - obuf);
+ return buf - obuf;
}
static int tm2_read_deltas(TM2Context *ctx, int stream_id) {
Modified: trunk/libavcodec/vmdav.c
==============================================================================
--- trunk/libavcodec/vmdav.c (original)
+++ trunk/libavcodec/vmdav.c Tue May 6 11:16:36 2008
@@ -162,13 +162,13 @@ static int rle_unpack(const unsigned cha
if (l & 0x80) {
l = (l & 0x7F) * 2;
if (pd + l > dest_end)
- return (ps - src);
+ return ps - src;
memcpy(pd, ps, l);
ps += l;
pd += l;
} else {
if (pd + i > dest_end)
- return (ps - src);
+ return ps - src;
for (i = 0; i < l; i++) {
*pd++ = ps[0];
*pd++ = ps[1];
@@ -178,7 +178,7 @@ static int rle_unpack(const unsigned cha
i += l;
} while (i < src_len);
- return (ps - src);
+ return ps - src;
}
static void vmd_decode(VmdVideoContext *s)
Modified: trunk/libavcodec/vorbis.c
==============================================================================
--- trunk/libavcodec/vorbis.c (original)
+++ trunk/libavcodec/vorbis.c Tue May 6 11:16:36 2008
@@ -40,7 +40,7 @@ unsigned int ff_vorbis_nth_root(unsigned
for(i=0,j=ret;i<n-1;i++) j*=ret;
} while (j<=x);
- return (ret-1);
+ return ret - 1;
}
// Generate vlc codes from vorbis huffman code lengths
Modified: trunk/libavformat/bethsoftvid.c
==============================================================================
--- trunk/libavformat/bethsoftvid.c (original)
+++ trunk/libavformat/bethsoftvid.c Tue May 6 11:16:36 2008
@@ -202,7 +202,7 @@ static int vid_read_packet(AVFormatConte
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:
Modified: trunk/libavformat/dv.c
==============================================================================
--- trunk/libavformat/dv.c (original)
+++ trunk/libavformat/dv.c Tue May 6 11:16:36 2008
@@ -87,7 +87,7 @@ static const uint8_t* dv_extract_pack(ui
return NULL;
}
- return (frame[offs] == t ? &frame[offs] : NULL);
+ return frame[offs] == t ? &frame[offs] : NULL;
}
/*
Modified: trunk/libavformat/gif.c
==============================================================================
--- trunk/libavformat/gif.c (original)
+++ trunk/libavformat/gif.c Tue May 6 11:16:36 2008
@@ -236,7 +236,7 @@ static int gif_image_write_header(ByteIO
/* 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);
}
Modified: trunk/libavformat/movenc.c
==============================================================================
--- trunk/libavformat/movenc.c (original)
+++ trunk/libavformat/movenc.c Tue May 6 11:16:36 2008
@@ -1247,7 +1247,7 @@ static int ascii_to_wc (ByteIOContext *p
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)
Modified: trunk/libavformat/mp3.c
==============================================================================
--- trunk/libavformat/mp3.c (original)
+++ trunk/libavformat/mp3.c Tue May 6 11:16:36 2008
@@ -160,7 +160,7 @@ static const char *id3v1_genre_str[ID3v1
/* 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 *bu
(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)
Modified: trunk/libavformat/mpegts.c
==============================================================================
--- trunk/libavformat/mpegts.c (original)
+++ trunk/libavformat/mpegts.c Tue May 6 11:16:36 2008
@@ -227,7 +227,7 @@ static int discard_pid(MpegTSContext *ts
}
}
- return (!used && discarded);
+ return !used && discarded;
}
/**
Modified: trunk/libavformat/mtv.c
==============================================================================
--- trunk/libavformat/mtv.c (original)
+++ trunk/libavformat/mtv.c Tue May 6 11:16:36 2008
@@ -124,7 +124,7 @@ static int mtv_read_header(AVFormatConte
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(AVFormatConte
pkt->stream_index = VIDEO_SID;
}
- return(ret);
+ return ret;
}
AVInputFormat mtv_demuxer = {
Modified: trunk/libavformat/rtsp.c
==============================================================================
--- trunk/libavformat/rtsp.c (original)
+++ trunk/libavformat/rtsp.c Tue May 6 11:16:36 2008
@@ -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)
Modified: trunk/libavformat/utils.c
==============================================================================
--- trunk/libavformat/utils.c (original)
+++ trunk/libavformat/utils.c Tue May 6 11:16:36 2008
@@ -1690,7 +1690,7 @@ static int has_codec_parameters(AVCodecC
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)
Modified: trunk/libavutil/base64.c
==============================================================================
--- trunk/libavutil/base64.c (original)
+++ trunk/libavutil/base64.c Tue May 6 11:16:36 2008
@@ -61,7 +61,7 @@ int av_base64_decode(uint8_t * out, cons
}
}
- return (dst - out);
+ return dst - out;
}
/*****************************************************************************
More information about the ffmpeg-cvslog
mailing list