[FFmpeg-cvslog] lavf/sr: Refine the coding style for init
Jun Zhao
git at videolan.org
Mon Jun 3 08:14:08 EEST 2019
ffmpeg | branch: master | Jun Zhao <barryjzhao at tencent.com> | Sat Jun 1 11:28:56 2019 +0800| [0b7bfa8ad79e483fd81fc006b35c4ef86990d46f] | committer: Jun Zhao
lavf/sr: Refine the coding style for init
We perfer the coding style like:
/* some stuff */
if (error) {
/* error handling */
return -(errorcode);
}
/* normal actions */
do_something()
Signed-off-by: Jun Zhao <barryjzhao at tencent.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0b7bfa8ad79e483fd81fc006b35c4ef86990d46f
---
libavfilter/vf_sr.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/libavfilter/vf_sr.c b/libavfilter/vf_sr.c
index 0be572ff9d..0433246e26 100644
--- a/libavfilter/vf_sr.c
+++ b/libavfilter/vf_sr.c
@@ -72,17 +72,16 @@ static av_cold int init(AVFilterContext *context)
av_log(context, AV_LOG_ERROR, "could not create DNN module for requested backend\n");
return AVERROR(ENOMEM);
}
+
if (!sr_context->model_filename){
av_log(context, AV_LOG_ERROR, "model file for network was not specified\n");
return AVERROR(EIO);
- } else {
- if (!sr_context->dnn_module->load_model) {
- av_log(context, AV_LOG_ERROR, "load_model for network was not specified\n");
- return AVERROR(EIO);
- } else {
- sr_context->model = (sr_context->dnn_module->load_model)(sr_context->model_filename);
- }
}
+ if (!sr_context->dnn_module->load_model) {
+ av_log(context, AV_LOG_ERROR, "load_model for network was not specified\n");
+ return AVERROR(EIO);
+ }
+ sr_context->model = (sr_context->dnn_module->load_model)(sr_context->model_filename);
if (!sr_context->model){
av_log(context, AV_LOG_ERROR, "could not load DNN model\n");
return AVERROR(EIO);
More information about the ffmpeg-cvslog
mailing list