Merge commit '2d6b3f3a9dce409ca51d70ef4b85c0593bb4b109'

[ffmpeg] / libavcodec / h264dec.h

diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h
index 2106ba077e0f4e0d3bcef42dae708091946df1d3..1d9723260dd3cf8016a96887bb4bb74f63cc8854 100644 (file)
--- a/libavcodec/h264dec.h
+++ b/libavcodec/h264dec.h
@@ -365,6 +365,7 @@ typedef struct H264Context {
     int context_initialized;
     int flags;
     int workaround_bugs;
+    int x264_build;
     /* Set when slice threading is used and at least one slice uses deblocking
      * mode 1 (i.e. across slice boundaries). Then we disable the loop filter
      * during normal MB decoding and execute it serially at the end.
@@ -416,6 +417,7 @@ typedef struct H264Context {
     uint8_t (*mvd_table[2])[2];
     uint8_t *direct_table;
 
+    uint8_t scan_padding[16];
     uint8_t zigzag_scan[16];
     uint8_t zigzag_scan8x8[64];
     uint8_t zigzag_scan8x8_cavlc[64];