h264: move some neighbour information into the per-slice context

1 files changed, 13 insertions, 13 deletions

diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index 203a04bd1d..007ed3cc57 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -320,6 +320,19 @@ typedef struct H264SliceContext {
 
     int chroma_pred_mode;
     int intra16x16_pred_mode;
+
+    int topleft_mb_xy;
+    int top_mb_xy;
+    int topright_mb_xy;
+    int left_mb_xy[LEFT_MBS];
+
+    int topleft_type;
+    int top_type;
+    int topright_type;
+    int left_type[LEFT_MBS];
+
+    const uint8_t *left_block;
+    int topleft_partition;
 } H264SliceContext;
 
 /**
@@ -357,19 +370,6 @@ typedef struct H264Context {
     int workaround_bugs;
 
     // prediction stuff
-    int topleft_mb_xy;
-    int top_mb_xy;
-    int topright_mb_xy;
-    int left_mb_xy[LEFT_MBS];
-
-    int topleft_type;
-    int top_type;
-    int topright_type;
-    int left_type[LEFT_MBS];
-
-    const uint8_t *left_block;
-    int topleft_partition;
-
     int8_t intra4x4_pred_mode_cache[5 * 8];
     int8_t(*intra4x4_pred_mode);
     H264PredContext hpc;