summaryrefslogtreecommitdiff
path: root/libavcodec/h264_direct.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2017-07-22 14:52:27 +0200
committerAnton Khirnov <anton@khirnov.net>2017-07-26 23:23:13 +0200
commit45c4bf3df03ef53ae61fa1473424d4ae024f22e4 (patch)
tree2cdc3cf57d5a91ddb41348822896221e5e1cfaa0 /libavcodec/h264_direct.c
parent45df7adc1d9b7e8fbae5af9328baa6ab3562002b (diff)
h264dec: track the last seen value of x264_build
Do not use the one in the SEI directly as that is reset at certain points. Inspired by patches from Michael Niedermayer <michaelni@gmx.at> and Anton Mitrofanov <BugMaster@narod.ru>. CC: libav-stable@libav.org
Diffstat (limited to 'libavcodec/h264_direct.c')
-rw-r--r--libavcodec/h264_direct.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c
index 7ec49b67f3..abac259cce 100644
--- a/libavcodec/h264_direct.c
+++ b/libavcodec/h264_direct.c
@@ -391,7 +391,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];
@@ -426,7 +426,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];