[FFmpeg-cvslog] Drop unreachable break and return statements

Diego Biurrun git at videolan.org
Thu Mar 30 11:28:20 EEST 2017


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Fri Mar 13 00:39:31 2015 +0100| [67351924fa91dea4339109100a4c0689f006581f] | committer: Diego Biurrun

Drop unreachable break and return statements

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=67351924fa91dea4339109100a4c0689f006581f
---

 libavcodec/bmvvideo.c  | 1 -
 libavcodec/hevc_sei.c  | 1 -
 libavcodec/indeo3.c    | 2 --
 libavcodec/sanm.c      | 3 ---
 libavformat/rtpproto.c | 1 -
 libavformat/rtspdec.c  | 1 -
 libavformat/smush.c    | 1 -
 libavutil/opt.c        | 2 --
 8 files changed, 12 deletions(-)

diff --git a/libavcodec/bmvvideo.c b/libavcodec/bmvvideo.c
index f4b8f29..4fb42f0 100644
--- a/libavcodec/bmvvideo.c
+++ b/libavcodec/bmvvideo.c
@@ -191,7 +191,6 @@ static int decode_bmv_frame(const uint8_t *source, int src_len, uint8_t *frame,
         if (dst == dst_end)
             return 0;
     }
-    return 0;
 }
 
 static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
diff --git a/libavcodec/hevc_sei.c b/libavcodec/hevc_sei.c
index 8865cec..8c913f9 100644
--- a/libavcodec/hevc_sei.c
+++ b/libavcodec/hevc_sei.c
@@ -173,7 +173,6 @@ static int decode_nal_sei_message(HEVCContext *s)
     } else { /* nal_unit_type == NAL_SEI_SUFFIX */
         return decode_nal_sei_suffix(s, payload_type, payload_size);
     }
-    return 0;
 }
 
 static int more_rbsp_data(GetBitContext *gb)
diff --git a/libavcodec/indeo3.c b/libavcodec/indeo3.c
index 89c11e6..314548f 100644
--- a/libavcodec/indeo3.c
+++ b/libavcodec/indeo3.c
@@ -831,8 +831,6 @@ static int parse_bintree(Indeo3DecodeContext *ctx, AVCodecContext *avctx,
             break;
         }
     }//while
-
-    return 0;
 }
 
 
diff --git a/libavcodec/sanm.c b/libavcodec/sanm.c
index 3d23195..7b00049 100644
--- a/libavcodec/sanm.c
+++ b/libavcodec/sanm.c
@@ -926,13 +926,10 @@ static int process_frame_obj(SANMVideoContext *ctx)
     case 1:
     case 3:
         return old_codec1(ctx, top, left, w, h);
-        break;
     case 37:
         return old_codec37(ctx, top, left, w, h);
-        break;
     case 47:
         return old_codec47(ctx, top, left, w, h);
-        break;
     default:
         avpriv_request_sample(ctx->avctx, "Subcodec %d", codec);
         return AVERROR_PATCHWELCOME;
diff --git a/libavformat/rtpproto.c b/libavformat/rtpproto.c
index 6582e4a..21a96d2 100644
--- a/libavformat/rtpproto.c
+++ b/libavformat/rtpproto.c
@@ -436,7 +436,6 @@ static int rtp_read(URLContext *h, uint8_t *buf, int size)
         if (h->flags & AVIO_FLAG_NONBLOCK)
             return AVERROR(EAGAIN);
     }
-    return len;
 }
 
 static int rtp_write(URLContext *h, const uint8_t *buf, int size)
diff --git a/libavformat/rtspdec.c b/libavformat/rtspdec.c
index 03374dc..8e8b340 100644
--- a/libavformat/rtspdec.c
+++ b/libavformat/rtspdec.c
@@ -700,7 +700,6 @@ static int rtsp_listen(AVFormatContext *s)
             return AVERROR_INVALIDDATA;
         }
     }
-    return 0;
 }
 
 static int rtsp_probe(AVProbeData *p)
diff --git a/libavformat/smush.c b/libavformat/smush.c
index 262b941..817e736 100644
--- a/libavformat/smush.c
+++ b/libavformat/smush.c
@@ -129,7 +129,6 @@ static int smush_read_header(AVFormatContext *ctx)
                 break;
             default:
                 return AVERROR_INVALIDDATA;
-                break;
             }
         }
 
diff --git a/libavutil/opt.c b/libavutil/opt.c
index 7cb3d66..44d6299 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -240,8 +240,6 @@ static int set_string_number(void *obj, void *target_obj, const AVOption *o, con
             return 0;
         notfirst = 1;
     }
-
-    return 0;
 }
 
 int av_opt_set(void *obj, const char *name, const char *val, int search_flags)



More information about the ffmpeg-cvslog mailing list