videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

lavfi: remove redundant checks after av_parse_video_rate() 

Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2012-06-20 17:17:25 +00:00
parent 4da42ebe44
commit de05877390
5 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavfilter/vf_frei0r.c
View File

@ -400,8 +400,7 @@ static av_cold int source_init(AVFilterContext *ctx, const char *args, void *opa
return AVERROR(EINVAL);
}
if (av_parse_video_rate(&frame_rate_q, frame_rate) < 0 ||
frame_rate_q.den <= 0 || frame_rate_q.num <= 0) {
if (av_parse_video_rate(&frame_rate_q, frame_rate) < 0) {
av_log(ctx, AV_LOG_ERROR, "Invalid frame rate: '%s'\n", frame_rate);
return AVERROR(EINVAL);
}

6
libavfilter/vsrc_color.c
View File

@ -90,8 +90,7 @@ static av_cold int color_init(AVFilterContext *ctx, const char *args, void *opaq
av_log(ctx, AV_LOG_ERROR, "Error parsing options string: '%s'\n", args);
goto end;
}
if (av_parse_video_rate(&frame_rate_q, color->rate_str) < 0 ||
frame_rate_q.den <= 0 || frame_rate_q.num <= 0) {
if (av_parse_video_rate(&frame_rate_q, color->rate_str) < 0) {
av_log(ctx, AV_LOG_ERROR, "Invalid frame rate: %s\n", color->rate_str);
ret = AVERROR(EINVAL);
goto end;
@ -107,8 +106,7 @@ static av_cold int color_init(AVFilterContext *ctx, const char *args, void *opaq
av_log(ctx, AV_LOG_ERROR, "Invalid frame size: %s\n", frame_size);
return AVERROR(EINVAL);
}
if (av_parse_video_rate(&frame_rate_q, frame_rate) < 0 ||
frame_rate_q.den <= 0 || frame_rate_q.num <= 0) {
if (av_parse_video_rate(&frame_rate_q, frame_rate) < 0) {
av_log(ctx, AV_LOG_ERROR, "Invalid frame rate: %s\n", frame_rate);
return AVERROR(EINVAL);
}

3
libavfilter/vsrc_mandelbrot.c
View File

@ -131,8 +131,7 @@ static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
mb->start_scale /=mb->h;
mb->end_scale /=mb->h;
if (av_parse_video_rate(&rate_q, mb->rate) < 0 ||
rate_q.den <= 0 || rate_q.num <= 0) {
if (av_parse_video_rate(&rate_q, mb->rate) < 0) {
av_log(ctx, AV_LOG_ERROR, "Invalid frame rate: %s\n", mb->rate);
return AVERROR(EINVAL);
}

3
libavfilter/vsrc_mptestsrc.c
View File

@ -276,8 +276,7 @@ static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
return ret;
}
if ((ret = av_parse_video_rate(&frame_rate_q, test->rate)) < 0 ||
frame_rate_q.den <= 0 || frame_rate_q.num <= 0) {
if ((ret = av_parse_video_rate(&frame_rate_q, test->rate)) < 0) {
av_log(ctx, AV_LOG_ERROR, "Invalid frame rate: '%s'\n", test->rate);
return ret;
}

3
libavfilter/vsrc_testsrc.c
View File

@ -86,8 +86,7 @@ static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
return ret;
}
if ((ret = av_parse_video_rate(&frame_rate_q, test->rate)) < 0 ||
frame_rate_q.den <= 0 || frame_rate_q.num <= 0) {
if ((ret = av_parse_video_rate(&frame_rate_q, test->rate)) < 0) {
av_log(ctx, AV_LOG_ERROR, "Invalid frame rate: '%s'\n", test->rate);
return ret;
}