[FFmpeg-cvslog] error_resilience: Drop asserts from guess_mv()

Diego Biurrun git at videolan.org
Thu Aug 21 21:37:52 CEST 2014


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Wed Aug 20 09:35:08 2014 -0700| [7cb66ebc0be48489785f7166c9d15eac594b0763] | committer: Diego Biurrun

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.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7cb66ebc0be48489785f7166c9d15eac594b0763
---

 libavcodec/error_resilience.c |    2 --
 1 file changed, 2 deletions(-)

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)



More information about the ffmpeg-cvslog mailing list