Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
aom-rav1e
Commits
67c9ab0b
Commit
67c9ab0b
authored
Sep 27, 2017
by
Jonathan Matthews
Browse files
Reset intra_filter in case it isn't read
BUG:aomedia:824 Change-Id: I67bfd16a9ba994055ccbaf624c58117c7939d5c8
parent
ec92c113
Changes
1
Hide whitespace changes
Inline
Side-by-side
av1/decoder/decodemv.c
View file @
67c9ab0b
...
...
@@ -922,6 +922,9 @@ static void read_intra_angle_info(AV1_COMMON *const cm, MACROBLOCKD *const xd,
mbmi
->
angle_delta
[
0
]
=
0
;
mbmi
->
angle_delta
[
1
]
=
0
;
#if CONFIG_INTRA_INTERP
mbmi
->
intra_filter
=
INTRA_FILTER_LINEAR
;
#endif // CONFIG_INTRA_INTERP
if
(
!
av1_use_angle_delta
(
bsize
))
return
;
...
...
@@ -935,8 +938,6 @@ static void read_intra_angle_info(AV1_COMMON *const cm, MACROBLOCKD *const xd,
mbmi
->
intra_filter
=
aom_read_symbol
(
r
,
ec_ctx
->
intra_filter_cdf
[
ctx
],
INTRA_FILTERS
,
ACCT_STR
);
if
(
counts
)
++
counts
->
intra_filter
[
ctx
][
mbmi
->
intra_filter
];
}
else
{
mbmi
->
intra_filter
=
INTRA_FILTER_LINEAR
;
}
#endif // CONFIG_INTRA_INTERP
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment