Merge commit '441e8ae5efd681055e5af6f4317fb60110de9dd0'

[ffmpeg] / libavcodec / h264.h

diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index b1921ef6f68a67275a5774d7f49710aaf9a10173..15b9a5da12a497364c8f16e4315289af2f0f3d57 100644 (file)
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -786,6 +786,12 @@ typedef struct H264Context {
     int has_afd;
 
 
+/* for frame threading, this is set to 1
+     * after finish_setup() has been called, so we cannot modify
+     * some context properties (which are supposed to stay constant between
+     * slices) anymore */
+    int setup_finished;
+
     // Timestamp stuff
     int sei_buffering_period_present;   ///< Buffering period SEI flag
     int initial_cpb_removal_delay[32];  ///< Initial timestamps for CPBs