diff options
author | Mans Rullgard <mans@mansr.com> | 2011-07-04 00:02:18 +0400 |
---|---|---|
committer | Mans Rullgard <mans@mansr.com> | 2011-07-04 00:39:07 +0400 |
commit | add41decd94b2d3581a3715ba10f27168b8cdb1b (patch) | |
tree | 75b99269199b63d99c9cfa92e876cf4682bf44b5 | |
parent | f75e3da535f297ddbe501ce866e57ccca7645455 (diff) |
Remove return statements following infinite loops without break
These statements cannot be reached and are thus not needed.
This removes a number of compiler warnings.
Signed-off-by: Mans Rullgard <mans@mansr.com>
-rw-r--r-- | libavcodec/h264.c | 1 | ||||
-rw-r--r-- | libavcodec/mpeg12.c | 2 | ||||
-rw-r--r-- | libavformat/asfdec.c | 2 | ||||
-rw-r--r-- | libavformat/bethsoftvid.c | 2 | ||||
-rw-r--r-- | libavformat/mm.c | 2 | ||||
-rw-r--r-- | libavformat/mmsh.c | 1 | ||||
-rw-r--r-- | libavformat/mov.c | 1 | ||||
-rw-r--r-- | libavformat/rtmpproto.c | 1 | ||||
-rw-r--r-- | libavformat/swfdec.c | 1 | ||||
-rw-r--r-- | libavutil/opt.c | 1 | ||||
-rw-r--r-- | libavutil/parseutils.c | 1 |
11 files changed, 0 insertions, 15 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 2c000a3420..37dab73dc0 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -3552,7 +3552,6 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg){ ff_draw_horiz_band(s, 16*s->mb_y, 16); } #endif - return -1; //not reached } /** diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 03c95c191d..986cad5fd2 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -1928,8 +1928,6 @@ static int slice_decode_thread(AVCodecContext *c, void *arg){ if(mb_y < 0 || mb_y >= s->end_mb_y) return -1; } - - return 0; //not reached } /** diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c index 4fafb26259..38fe4f9fa2 100644 --- a/libavformat/asfdec.c +++ b/libavformat/asfdec.c @@ -1099,8 +1099,6 @@ static int asf_read_packet(AVFormatContext *s, AVPacket *pkt) assert(asf->packet_size_left < FRAME_HEADER_SIZE || asf->packet_segments < 1); asf->packet_time_start = 0; } - - return 0; } // Added to support seeking after packets have been read diff --git a/libavformat/bethsoftvid.c b/libavformat/bethsoftvid.c index 01e6f55cd4..5e6a776824 100644 --- a/libavformat/bethsoftvid.c +++ b/libavformat/bethsoftvid.c @@ -220,8 +220,6 @@ static int vid_read_packet(AVFormatContext *s, av_log(s, AV_LOG_ERROR, "unknown block (character = %c, decimal = %d, hex = %x)!!!\n", block_type, block_type, block_type); return -1; } - - return 0; } AVInputFormat ff_bethsoftvid_demuxer = { diff --git a/libavformat/mm.c b/libavformat/mm.c index bea6161315..dae659f3c6 100644 --- a/libavformat/mm.c +++ b/libavformat/mm.c @@ -184,8 +184,6 @@ static int read_packet(AVFormatContext *s, avio_skip(pb, length); } } - - return 0; } AVInputFormat ff_mm_demuxer = { diff --git a/libavformat/mmsh.c b/libavformat/mmsh.c index af040e27a9..0ce282c906 100644 --- a/libavformat/mmsh.c +++ b/libavformat/mmsh.c @@ -208,7 +208,6 @@ static int get_http_header_data(MMSHContext *mmsh) } } } - return 0; } static int mmsh_open(URLContext *h, const char *uri, int flags) diff --git a/libavformat/mov.c b/libavformat/mov.c index c720440472..194c2f86dd 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2308,7 +2308,6 @@ static int mov_probe(AVProbeData *p) return score; } } - return score; } // must be done after parsing all trak because there's no order requirement diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index f499bd3b71..e841f9b8d1 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -761,7 +761,6 @@ static int get_packet(URLContext *s, int for_header) } ff_rtmp_packet_destroy(&rpkt); } - return 0; } static int rtmp_close(URLContext *h) diff --git a/libavformat/swfdec.c b/libavformat/swfdec.c index eec9524ecf..c838fa8e61 100644 --- a/libavformat/swfdec.c +++ b/libavformat/swfdec.c @@ -204,7 +204,6 @@ static int swf_read_packet(AVFormatContext *s, AVPacket *pkt) skip: avio_skip(pb, len); } - return 0; } AVInputFormat ff_swf_demuxer = { diff --git a/libavutil/opt.c b/libavutil/opt.c index f65f31fcda..acb745cf3d 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -196,7 +196,6 @@ int av_set_string3(void *obj, const char *name, const char *val, int alloc, cons return 0; notfirst=1; } - return AVERROR(EINVAL); } if (alloc) { diff --git a/libavutil/parseutils.c b/libavutil/parseutils.c index 0272c3ef67..c8124c532e 100644 --- a/libavutil/parseutils.c +++ b/libavutil/parseutils.c @@ -462,7 +462,6 @@ const char *small_strptime(const char *p, const char *fmt, p++; } } - return p; } static time_t mktimegm(struct tm *tm) |