Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / h264.h

diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index af0c1e56b81689264921d2a3697a7bf0782a26d4..3355d05e97a6d7c6075452335e747db112cd574d 100644 (file)
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -368,7 +368,7 @@ typedef struct H264Context {
     int direct_spatial_mv_pred;
     int col_parity;
     int col_fieldoff;
-    int dist_scale_factor[16];
+    int dist_scale_factor[32];
     int dist_scale_factor_field[2][32];
     int map_col_to_list0[2][16 + 32];
     int map_col_to_list0_field[2][2][16 + 32];
@@ -452,6 +452,8 @@ typedef struct H264Context {
     int nal_length_size;  ///< Number of bytes used for nal length (1, 2 or 4)
     int got_first;        ///< this flag is != 0 if we've parsed a frame
 
+    int context_reinitialized;
+
     SPS *sps_buffers[MAX_SPS_COUNT];
     PPS *pps_buffers[MAX_PPS_COUNT];