From 1c8de4dd949c8bec5e547693d3cac6b42462a953 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Raulet?= Date: Sun, 20 Oct 2013 21:19:15 +0200 Subject: [PATCH] hevc: pretty print(cherry picked from commit 6332b3afe298b9e1060e8549aea3aa2771b43f5d) Conflicts: libavcodec/hevc.h libavcodec/hevc_filter.c libavcodec/hevc_refs.c Signed-off-by: Michael Niedermayer --- libavcodec/hevc.c | 3 --- libavcodec/hevc.h | 6 +++--- libavcodec/hevc_filter.c | 4 ++-- libavcodec/hevc_refs.c | 2 +- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c index bfe1ab8874..cdf0237c23 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -1472,7 +1472,6 @@ static int hls_coding_unit(HEVCContext *s, int x0, int y0, int log2_cb_size) } else lc->cu.cu_transquant_bypass_flag = 0; - if (s->sh.slice_type != I_SLICE) { uint8_t skip_flag = ff_hevc_skip_flag_decode(s, x0, y0, x_cb, y_cb); @@ -2263,8 +2262,6 @@ static int hevc_decode_frame(AVCodecContext *avctx, void *data, int *got_output, int ret; HEVCContext *s = avctx->priv_data; - //av_log(avctx, AV_LOG_WARNING, "decode size %d\n", avpkt->size); - if (!avpkt->size) { ret = ff_hevc_output_frame(s, data, 1); if (ret < 0) diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h index 9091862c8a..000ccd46d6 100644 --- a/libavcodec/hevc.h +++ b/libavcodec/hevc.h @@ -706,9 +706,9 @@ typedef struct HEVCFrame { } HEVCFrame; typedef struct FilterData { - int x; - int y; - int size; + int x; + int y; + int size; int slice_or_tiles_left_boundary; int slice_or_tiles_up_boundary; } FilterData; diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c index ea83795975..d67cdd5cba 100644 --- a/libavcodec/hevc_filter.c +++ b/libavcodec/hevc_filter.c @@ -334,8 +334,8 @@ static void deblocking_filter_CTB(HEVCContext *s, int x0, int y0) int pcmf = (s->sps->pcm_enabled_flag && s->sps->pcm.loop_filter_disable_flag) || s->pps->transquant_bypass_enable_flag; - if(x0) { - left_tc_offset = s->deblock[ctb-1].tc_offset; + if (x0) { + left_tc_offset = s->deblock[ctb-1].tc_offset; left_beta_offset = s->deblock[ctb-1].beta_offset; } diff --git a/libavcodec/hevc_refs.c b/libavcodec/hevc_refs.c index 2cf6860d1c..c4a3b461c1 100644 --- a/libavcodec/hevc_refs.c +++ b/libavcodec/hevc_refs.c @@ -225,7 +225,7 @@ int ff_hevc_slice_rpl(HEVCContext *s) { SliceHeader *sh = &s->sh; - uint8_t nb_list = sh->slice_type == B_SLICE ? 2 : 1; + uint8_t nb_list = sh->slice_type == B_SLICE ? 2 : 1; uint8_t list_idx; int i, j, ret;