diff options
| author | Adrian Grange <agrange@google.com> | 2015-02-13 15:28:01 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2015-02-13 15:28:01 -0800 |
| commit | 4a03baa2f625fbf74039e1219371f0627a258b36 (patch) | |
| tree | a52a37c1ecfcae93c43c679edff62f34b380b030 | |
| parent | 1cfbc86e3809c87b2397487baa01e3046bb0531d (diff) | |
| parent | e31516a08fdfbb51061483f19c7d8d349c55fc1c (diff) | |
| download | libvpx-4a03baa2f625fbf74039e1219371f0627a258b36.tar libvpx-4a03baa2f625fbf74039e1219371f0627a258b36.tar.gz libvpx-4a03baa2f625fbf74039e1219371f0627a258b36.tar.bz2 libvpx-4a03baa2f625fbf74039e1219371f0627a258b36.zip | |
Merge "Improve readability: move return statements"
| -rw-r--r-- | vp9/vp9_dx_iface.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/vp9/vp9_dx_iface.c b/vp9/vp9_dx_iface.c index b69721f91..f6cb47d52 100644 --- a/vp9/vp9_dx_iface.c +++ b/vp9/vp9_dx_iface.c @@ -891,13 +891,13 @@ static vpx_codec_err_t ctrl_get_last_ref_updates(vpx_codec_alg_priv_t *ctx, FrameWorkerData *const frame_worker_data = (FrameWorkerData *)worker->data1; *update_info = frame_worker_data->pbi->refresh_frame_flags; + return VPX_CODEC_OK; } else { return VPX_CODEC_ERROR; } - return VPX_CODEC_OK; - } else { - return VPX_CODEC_INVALID_PARAM; } + + return VPX_CODEC_INVALID_PARAM; } static vpx_codec_err_t ctrl_get_frame_corrupted(vpx_codec_alg_priv_t *ctx, @@ -914,13 +914,13 @@ static vpx_codec_err_t ctrl_get_frame_corrupted(vpx_codec_alg_priv_t *ctx, if (frame_worker_data->pbi->common.frame_to_show == NULL) return VPX_CODEC_ERROR; *corrupted = frame_bufs[ctx->last_show_frame].buf.corrupted; + return VPX_CODEC_OK; } else { return VPX_CODEC_ERROR; } - return VPX_CODEC_OK; - } else { - return VPX_CODEC_INVALID_PARAM; } + + return VPX_CODEC_INVALID_PARAM; } static vpx_codec_err_t ctrl_get_frame_size(vpx_codec_alg_priv_t *ctx, @@ -945,9 +945,9 @@ static vpx_codec_err_t ctrl_get_frame_size(vpx_codec_alg_priv_t *ctx, } else { return VPX_CODEC_ERROR; } - } else { - return VPX_CODEC_INVALID_PARAM; } + + return VPX_CODEC_INVALID_PARAM; } static vpx_codec_err_t ctrl_get_display_size(vpx_codec_alg_priv_t *ctx, @@ -968,13 +968,13 @@ static vpx_codec_err_t ctrl_get_display_size(vpx_codec_alg_priv_t *ctx, const VP9_COMMON *const cm = &frame_worker_data->pbi->common; display_size[0] = cm->display_width; display_size[1] = cm->display_height; + return VPX_CODEC_OK; } else { return VPX_CODEC_ERROR; } - return VPX_CODEC_OK; - } else { - return VPX_CODEC_INVALID_PARAM; } + + return VPX_CODEC_INVALID_PARAM; } static vpx_codec_err_t ctrl_get_bit_depth(vpx_codec_alg_priv_t *ctx, @@ -992,9 +992,9 @@ static vpx_codec_err_t ctrl_get_bit_depth(vpx_codec_alg_priv_t *ctx, } else { return VPX_CODEC_ERROR; } - } else { - return VPX_CODEC_INVALID_PARAM; } + + return VPX_CODEC_INVALID_PARAM; } static vpx_codec_err_t ctrl_set_invert_tile_order(vpx_codec_alg_priv_t *ctx, |