diff options
| author | Mickaël Raulet <mraulet@insa-rennes.fr> | 2013-10-20 21:19:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-22 08:41:14 +0200 |
| commit | 1c8de4dd949c8bec5e547693d3cac6b42462a953 (patch) | |
| tree | 0d29d5e8a107ab965d35a4fe7913cf1e71faa5f2 /libavcodec/hevc.c | |
| parent | a8fafa89785bb6f85e764a50cec67fce1d1a4ce5 (diff) | |
| download | android_external_ffmpeg-1c8de4dd949c8bec5e547693d3cac6b42462a953.tar.gz android_external_ffmpeg-1c8de4dd949c8bec5e547693d3cac6b42462a953.tar.bz2 android_external_ffmpeg-1c8de4dd949c8bec5e547693d3cac6b42462a953.zip | |
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 <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hevc.c')
| -rw-r--r-- | libavcodec/hevc.c | 3 |
1 files changed, 0 insertions, 3 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) |