From c377e04d8aa74d030672e9a4788a700b0695fc14 Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Sat, 17 Jan 2015 22:28:46 +0100
Subject: h264: move top_borders into the per-slice context

Also change the method for allocating to the same one as used by
edge_emu_buffer.
---
 libavcodec/h264.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'libavcodec/h264.h')

diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index 2c41584450..ba4ee39ab4 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -401,8 +401,10 @@ typedef struct H264SliceContext {
 
     uint8_t *bipred_scratchpad;
     uint8_t *edge_emu_buffer;
+    uint8_t (*top_borders[2])[(16 * 3) * 2];
     int bipred_scratchpad_allocated;
     int edge_emu_buffer_allocated;
+    int top_borders_allocated[2];
 
     /**
      * non zero coeff count cache.
@@ -473,7 +475,6 @@ typedef struct H264Context {
 
     int8_t(*intra4x4_pred_mode);
     H264PredContext hpc;
-    uint8_t (*top_borders[2])[(16 * 3) * 2];
 
     uint8_t (*non_zero_count)[48];
 
-- 
cgit v1.2.3