diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-01-25 14:58:49 +0300 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2015-01-27 11:05:25 +0300 |
commit | b82722df9b2911bd41e0928db4804067b39e6528 (patch) | |
tree | 453cf430ed8df6ff9dd097a123188bac9084481c /libavcodec/hevc.c | |
parent | e72e8c5a1df61447ac7af750531e96e8b62d02ba (diff) |
hevc: reindent after previous commit
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavcodec/hevc.c')
-rw-r--r-- | libavcodec/hevc.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c index bf7203a9c0..7a687a9e15 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -2591,19 +2591,19 @@ static int decode_nal_unit(HEVCContext *s, const HEVCNAL *nal) if (ret < 0) goto fail; } else { - ctb_addr_ts = hls_slice_data(s); - if (ctb_addr_ts >= (s->sps->ctb_width * s->sps->ctb_height)) { - s->is_decoded = 1; - if ((s->pps->transquant_bypass_enable_flag || - (s->sps->pcm.loop_filter_disable_flag && s->sps->pcm_enabled_flag)) && - s->sps->sao_enabled) - restore_tqb_pixels(s); - } + ctb_addr_ts = hls_slice_data(s); + if (ctb_addr_ts >= (s->sps->ctb_width * s->sps->ctb_height)) { + s->is_decoded = 1; + if ((s->pps->transquant_bypass_enable_flag || + (s->sps->pcm.loop_filter_disable_flag && s->sps->pcm_enabled_flag)) && + s->sps->sao_enabled) + restore_tqb_pixels(s); + } - if (ctb_addr_ts < 0) { - ret = ctb_addr_ts; - goto fail; - } + if (ctb_addr_ts < 0) { + ret = ctb_addr_ts; + goto fail; + } } break; case NAL_EOS_NUT: @@ -2917,16 +2917,16 @@ static int hevc_decode_frame(AVCodecContext *avctx, void *data, int *got_output, av_log(avctx, AV_LOG_ERROR, "hardware accelerator failed to decode picture\n"); } else { - /* verify the SEI checksum */ - if (avctx->err_recognition & AV_EF_CRCCHECK && s->is_decoded && - s->is_md5) { - ret = verify_md5(s, s->ref->frame); - if (ret < 0 && avctx->err_recognition & AV_EF_EXPLODE) { - ff_hevc_unref_frame(s, s->ref, ~0); - return ret; + /* verify the SEI checksum */ + if (avctx->err_recognition & AV_EF_CRCCHECK && s->is_decoded && + s->is_md5) { + ret = verify_md5(s, s->ref->frame); + if (ret < 0 && avctx->err_recognition & AV_EF_EXPLODE) { + ff_hevc_unref_frame(s, s->ref, ~0); + return ret; + } } } - } s->is_md5 = 0; if (s->is_decoded) { |