aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/hevc_cabac.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2016-10-18 21:14:18 +0200
committerAnton Khirnov <anton@khirnov.net>2016-10-21 10:11:20 +0200
commit0bfdcce4d42a6e654c00ea5f9237dc987626457f (patch)
tree9ffae08f0f686aa135571427d49709012652356d /libavcodec/hevc_cabac.c
parent096a8effa3f8f3455292c958c3ed07e798def7bd (diff)
downloadffmpeg-0bfdcce4d42a6e654c00ea5f9237dc987626457f.tar.gz
hevc: move the SliceType enum to hevc.h
Those values are decoder-independent and are also use by the VA-API encoder.
Diffstat (limited to 'libavcodec/hevc_cabac.c')
-rw-r--r--libavcodec/hevc_cabac.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/hevc_cabac.c b/libavcodec/hevc_cabac.c
index eb16f57cd8..0432330e82 100644
--- a/libavcodec/hevc_cabac.c
+++ b/libavcodec/hevc_cabac.c
@@ -25,6 +25,7 @@
#include "libavutil/common.h"
#include "cabac_functions.h"
+#include "hevc.h"
#include "hevcdec.h"
#define CABAC_MAX_BIN 31
@@ -358,7 +359,7 @@ static void cabac_init_state(HEVCContext *s)
int init_type = 2 - s->sh.slice_type;
int i;
- if (s->sh.cabac_init_flag && s->sh.slice_type != I_SLICE)
+ if (s->sh.cabac_init_flag && s->sh.slice_type != HEVC_SLICE_I)
init_type ^= 3;
for (i = 0; i < HEVC_CONTEXTS; i++) {