diff options
| author | Clément Bœsch <cboesch@gopro.com> | 2017-03-30 10:26:29 +0200 |
|---|---|---|
| committer | Clément Bœsch <cboesch@gopro.com> | 2017-03-30 10:26:29 +0200 |
| commit | 03f5e80bdbbfa3229b6af3ad7bc94cc1468cc1b6 (patch) | |
| tree | 22ff97ac03e7a5140ed6050060e50a8fa508c897 | |
| parent | f291a9a1adab8ba41e06073b8a9e51f528be6532 (diff) | |
| parent | 67351924fa91dea4339109100a4c0689f006581f (diff) | |
| download | ffmpeg-streaming-03f5e80bdbbfa3229b6af3ad7bc94cc1468cc1b6.zip ffmpeg-streaming-03f5e80bdbbfa3229b6af3ad7bc94cc1468cc1b6.tar.gz | |
Merge commit '67351924fa91dea4339109100a4c0689f006581f'
* commit '67351924fa91dea4339109100a4c0689f006581f':
Drop unreachable break and return statements
Merged-by: Clément Bœsch <cboesch@gopro.com>
| -rw-r--r-- | libavcodec/bmvvideo.c | 1 | ||||
| -rw-r--r-- | libavcodec/hevc_sei.c | 1 | ||||
| -rw-r--r-- | libavcodec/sanm.c | 3 | ||||
| -rw-r--r-- | libavformat/rtpproto.c | 1 | ||||
| -rw-r--r-- | libavformat/rtspdec.c | 1 | ||||
| -rw-r--r-- | libavformat/smush.c | 1 | ||||
| -rw-r--r-- | libavutil/opt.c | 2 |
7 files changed, 0 insertions, 10 deletions
diff --git a/libavcodec/bmvvideo.c b/libavcodec/bmvvideo.c index dbbc100..78a0945 100644 --- a/libavcodec/bmvvideo.c +++ b/libavcodec/bmvvideo.c @@ -193,7 +193,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 a4b93c2..8fc026c 100644 --- a/libavcodec/hevc_sei.c +++ b/libavcodec/hevc_sei.c @@ -354,7 +354,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 1; } static int more_rbsp_data(GetBitContext *gb) diff --git a/libavcodec/sanm.c b/libavcodec/sanm.c index bac6fb4..dab9e41 100644 --- a/libavcodec/sanm.c +++ b/libavcodec/sanm.c @@ -978,13 +978,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 840a36d..0706cae 100644 --- a/libavformat/rtpproto.c +++ b/libavformat/rtpproto.c @@ -512,7 +512,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 a722b98..0cb8f53 100644 --- a/libavformat/rtspdec.c +++ b/libavformat/rtspdec.c @@ -698,7 +698,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 5a9249a..fe544d8 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 6ae2af6..6f87078 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -311,8 +311,6 @@ static int set_string_number(void *obj, void *target_obj, const AVOption *o, con if (!i || !*val) return 0; } - - return 0; } static int set_string_image_size(void *obj, const AVOption *o, const char *val, int *dst) |
