From a67f8ae9a2c8529bf6a635e8ca4e3483592708b1 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 mvd_table into the per-slice context

---
 libavcodec/h264.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'libavcodec/h264.h')

diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index 7ced3b58e0..cd5788a0aa 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -402,6 +402,8 @@ typedef struct H264SliceContext {
     ///< check that i is not too large or ensure that there is some unused stuff after mb
     int16_t mb_padding[256 * 2];
 
+    uint8_t (*mvd_table[2])[2];
+
     /**
      * Cabac
      */
@@ -991,7 +993,7 @@ static av_always_inline void write_back_motion_list(H264Context *h,
     AV_COPY128(mv_dst + 2 * b_stride, mv_src + 8 * 2);
     AV_COPY128(mv_dst + 3 * b_stride, mv_src + 8 * 3);
     if (CABAC(h)) {
-        uint8_t (*mvd_dst)[2] = &h->mvd_table[list][FMO ? 8 * h->mb_xy
+        uint8_t (*mvd_dst)[2] = &sl->mvd_table[list][FMO ? 8 * h->mb_xy
                                                         : h->mb2br_xy[h->mb_xy]];
         uint8_t(*mvd_src)[2]  = &h->mvd_cache[list][scan8[0]];
         if (IS_SKIP(mb_type)) {
-- 
cgit v1.2.1