projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e8f2823
)
error_resilience: Drop asserts from guess_mv()
author
Diego Biurrun
<diego@biurrun.de>
Wed, 20 Aug 2014 16:35:08 +0000
(09:35 -0700)
committer
Diego Biurrun
<diego@biurrun.de>
Sun, 24 Aug 2014 20:00:53 +0000
(13:00 -0700)
The asserts check struct members that are not referenced in guess_mv()
and one of them fails to compile.
(cherry picked from commit
7cb66ebc0be48489785f7166c9d15eac594b0763
)
Signed-off-by: Diego Biurrun <diego@biurrun.de>
libavcodec/error_resilience.c
patch
|
blob
|
history
diff --git
a/libavcodec/error_resilience.c
b/libavcodec/error_resilience.c
index
b41474a
..
33b0360
100644
(file)
--- a/
libavcodec/error_resilience.c
+++ b/
libavcodec/error_resilience.c
@@
-430,8
+430,6
@@
static void guess_mv(ERContext *s)
if (fixed[mb_xy] == MV_FROZEN)
continue;
- assert(!IS_INTRA(s->cur_pic.mb_type[mb_xy]));
- assert(s->last_pic && s->last_pic.f->data[0]);
j = 0;
if (mb_x > 0 && fixed[mb_xy - 1] == MV_FROZEN)