[SCM] libav/master: error_resilience: Drop asserts from guess_mv()

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d04fb118684f7d57474ee52da9c03cfee7a442b5
Author: Diego Biurrun <diego at biurrun.de>
Date:   Wed Aug 20 09:35:08 2014 -0700

    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 at biurrun.de>

diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c
index b41474a..33b0360 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)

-- 
Libav/FFmpeg packaging