summaryrefslogtreecommitdiff
path: root/libavcodec/h264.h
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2015-01-17 22:28:46 +0100
committerAnton Khirnov <anton@khirnov.net>2015-03-21 11:27:14 +0100
commita9b201cacf85d710b102010cb4baef97f00ea39b (patch)
tree9a02274cb412bc791360fc4fece8585593604212 /libavcodec/h264.h
parente6c90ce94f1b07f50cea2babf7471af455cca0ff (diff)
h264: move cabac_init_idc into the per-slice context
Diffstat (limited to 'libavcodec/h264.h')
-rw-r--r--libavcodec/h264.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index d28d1858c5..18aa8cbc00 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -416,6 +416,7 @@ typedef struct H264SliceContext {
*/
CABACContext cabac;
uint8_t cabac_state[1024];
+ int cabac_init_idc;
} H264SliceContext;
/**
@@ -597,8 +598,6 @@ typedef struct H264Context {
int long_ref_count; ///< number of actual long term references
int short_ref_count; ///< number of actual short term references
- int cabac_init_idc;
-
/**
* @name Members for slice based multithreading
* @{