diff options
| author | James Almer <jamrial@gmail.com> | 2017-03-23 20:02:11 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-03-23 20:02:11 -0300 |
| commit | dc39ccdc3b88e9ec3b4aa3581798c30660d94d07 (patch) | |
| tree | ea6dd9bc79af60d63fe0edd905158b3440db23d4 /libavcodec/hevc_cabac.c | |
| parent | 0f4abbd4ee1c5b34068cb48ceab3515641d6e0fb (diff) | |
| parent | 0bfdcce4d42a6e654c00ea5f9237dc987626457f (diff) | |
Merge commit '0bfdcce4d42a6e654c00ea5f9237dc987626457f'
* commit '0bfdcce4d42a6e654c00ea5f9237dc987626457f':
hevc: move the SliceType enum to hevc.h
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/hevc_cabac.c')
| -rw-r--r-- | libavcodec/hevc_cabac.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/hevc_cabac.c b/libavcodec/hevc_cabac.c index 205fc4edef..e27c54ed4b 100644 --- a/libavcodec/hevc_cabac.c +++ b/libavcodec/hevc_cabac.c @@ -26,6 +26,7 @@ #include "cabac_functions.h" #include "hevc_data.h" +#include "hevc.h" #include "hevcdec.h" #define CABAC_MAX_BIN 31 @@ -481,7 +482,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++) { |