aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/h264_direct.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2016-03-22 13:31:21 +0100
committerAnton Khirnov <anton@khirnov.net>2016-04-24 10:06:24 +0200
commit728d90a0c1973661a9e73da697bf4f90c9d19577 (patch)
treeb779fb0b411780ff68ac21e5de31265f4d194409 /libavcodec/h264_direct.c
parentc8dcff0cdb17d0aa03ac729eba12d1a20f1f59c8 (diff)
downloadffmpeg-728d90a0c1973661a9e73da697bf4f90c9d19577.tar.gz
h264: decouple h264_sei from the h264 decoder
Make the SEI parsing independent of the H264Context, to allow decoupling the parser from the decoder.
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 391f8f1d6a..9b6bb44366 100644
--- a/libavcodec/h264_direct.c
+++ b/libavcodec/h264_direct.c
@@ -390,7 +390,7 @@ single_col:
(l1ref0[0] < 0 && !l1ref1[0] &&
FFABS(l1mv1[0][0]) <= 1 &&
FFABS(l1mv1[0][1]) <= 1 &&
- h->x264_build > 33U))) {
+ h->sei.unregistered.x264_build > 33U))) {
a = b = 0;
if (ref[0] > 0)
a = mv[0];
@@ -425,7 +425,7 @@ single_col:
(l1ref0[i8] == 0 ||
(l1ref0[i8] < 0 &&
l1ref1[i8] == 0 &&
- h->x264_build > 33U))) {
+ h->sei.unregistered.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];