diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-27 21:44:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-27 22:15:01 +0200 |
| commit | bd5c6a519e9bb36256cbcc188b6c9721760f2290 (patch) | |
| tree | 41c869d150ec56ee7078f563bc9adee51fc95e97 /libavcodec/h264.h | |
| parent | 77412f0ecd23bdf75290c7f002ee7b7d249f7883 (diff) | |
| parent | 5ec0bdf2c524224f30ba4786f47324970aed4aaa (diff) | |
| download | ffmpeg-bd5c6a519e9bb36256cbcc188b6c9721760f2290.tar.gz | |
Merge commit '5ec0bdf2c524224f30ba4786f47324970aed4aaa'
* commit '5ec0bdf2c524224f30ba4786f47324970aed4aaa':
h264: do not update the context fields copied between threads after finish_setup()
Conflicts:
libavcodec/h264.h
libavcodec/h264_slice.c
See: f111831ed61103f9fa8fdda41473a23da016bdaa and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index b1921ef6f6..15b9a5da12 100644 --- 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 |