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/h264_direct.c | |
| parent | 5fd6fa0ca7f32d800a6044d28fb33a88e8de7283 (diff) | |
| parent | 45c4bf3df03ef53ae61fa1473424d4ae024f22e4 (diff) | |
| download | ffmpeg-streaming-bc987cf91dd9975b0949bb5f91b9f266ca53e0ff.zip ffmpeg-streaming-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/h264_direct.c')
| -rw-r--r-- | libavcodec/h264_direct.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c index a7a107c..ec9fca0 100644 --- a/libavcodec/h264_direct.c +++ b/libavcodec/h264_direct.c @@ -410,7 +410,7 @@ single_col: (l1ref0[0] < 0 && !l1ref1[0] && FFABS(l1mv1[0][0]) <= 1 && FFABS(l1mv1[0][1]) <= 1 && - h->sei.unregistered.x264_build > 33U))) { + h->x264_build > 33U))) { a = b = 0; if (ref[0] > 0) a = mv[0]; @@ -445,7 +445,7 @@ single_col: (l1ref0[i8] == 0 || (l1ref0[i8] < 0 && l1ref1[i8] == 0 && - h->sei.unregistered.x264_build > 33U))) { + h->x264_build > 33U))) { const int16_t (*l1mv)[2] = l1ref0[i8] == 0 ? l1mv0 : l1mv1; if (IS_SUB_8X8(sub_mb_type)) { const int16_t *mv_col = l1mv[x8 * 3 + y8 * 3 * b4_stride]; |
