diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-08 14:15:16 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-08 14:23:48 -0300 |
| commit | bc987cf91dd9975b0949bb5f91b9f266ca53e0ff (patch) | |
| tree | 576c2374596c851ce3c45a04d52466e7acf3198e /libavcodec/h264dec.h | |
| parent | 5fd6fa0ca7f32d800a6044d28fb33a88e8de7283 (diff) | |
| parent | 45c4bf3df03ef53ae61fa1473424d4ae024f22e4 (diff) | |
| download | ffmpeg-bc987cf91dd9975b0949bb5f91b9f266ca53e0ff.tar.gz | |
Merge commit '45c4bf3df03ef53ae61fa1473424d4ae024f22e4'
* commit '45c4bf3df03ef53ae61fa1473424d4ae024f22e4':
h264dec: track the last seen value of x264_build
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/h264dec.h')
| -rw-r--r-- | libavcodec/h264dec.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h index 2106ba077e..b87b947f95 100644 --- 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. |