RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '67351924fa91dea4339109100a4c0689f006581f' 

* commit '67351924fa91dea4339109100a4c0689f006581f':
  Drop unreachable break and return statements

Merged-by: Clément Bœsch <cboesch@gopro.com>
This commit is contained in:
Clément Bœsch 2017-03-30 10:26:29 +02:00
parent f291a9a1ad 67351924fa
commit 03f5e80bdb
7 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/bmvvideo.c
View File

@ -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,

1
libavcodec/hevc_sei.c
View File

@ -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)

3
libavcodec/sanm.c
View File

@ -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;

1
libavformat/rtpproto.c
View File

@ -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)

1
libavformat/rtspdec.c
View File

@ -698,7 +698,6 @@ static int rtsp_listen(AVFormatContext *s)
return AVERROR_INVALIDDATA;
}
}
return 0;
}
static int rtsp_probe(AVProbeData *p)

1
libavformat/smush.c
View File

@ -129,7 +129,6 @@ static int smush_read_header(AVFormatContext *ctx)
break;
default:
return AVERROR_INVALIDDATA;
break;
}
}

2
libavutil/opt.c
View File

@ -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)