aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2014-08-20 09:35:08 -0700
committerDiego Biurrun <diego@biurrun.de>2014-08-24 13:00:53 -0700
commitd04fb118684f7d57474ee52da9c03cfee7a442b5 (patch)
treec39e973f3bb9c9d9549ea89b2fd2ebb1c91bfc6d
parente8f2823f06513d3d1177b8ba7c853d63194e5d8a (diff)
downloadffmpeg-d04fb118684f7d57474ee52da9c03cfee7a442b5.tar.gz
error_resilience: Drop asserts from guess_mv()
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>
-rw-r--r--libavcodec/error_resilience.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c
index b41474ad48..33b0360092 100644
--- 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)