Mercurial > libavcodec.hg

changeset 4360:5f887a3c7281 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change the Snow encoder to always use the available MotionEstContext pointer.
author takis
date Thu, 18 Jan 2007 13:35:24 +0000
parents d276d6eed6a0
children f80a3b6c6f00
files snow.c
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/snow.c	Wed Jan 17 11:02:07 2007 +0000
+++ b/snow.c	Thu Jan 18 13:35:24 2007 +0000
@@ -2051,10 +2051,10 @@
     s->m.mb_stride=2;
     s->m.mb_x=
     s->m.mb_y= 0;
-    s->m.me.skip= 0;
-
-    assert(s->m.me.  stride ==   stride);
-    assert(s->m.me.uvstride == uvstride);
+    c->skip= 0;
+
+    assert(c->  stride ==   stride);
+    assert(c->uvstride == uvstride);
 
     c->penalty_factor    = get_penalty_factor(s->lambda, s->lambda2, c->avctx->me_cmp);
     c->sub_penalty_factor= get_penalty_factor(s->lambda, s->lambda2, c->avctx->me_sub_cmp);
@@ -2098,7 +2098,7 @@
         assert(ref_my >= c->ymin);
         assert(ref_my <= c->ymax);
 
-        ref_score= s->m.me.sub_motion_search(&s->m, &ref_mx, &ref_my, ref_score, 0, 0, level-LOG2_MB_SIZE+4, block_w);
+        ref_score= c->sub_motion_search(&s->m, &ref_mx, &ref_my, ref_score, 0, 0, level-LOG2_MB_SIZE+4, block_w);
         ref_score= ff_get_mb_score(&s->m, ref_mx, ref_my, 0, 0, level-LOG2_MB_SIZE+4, block_w, 0);
         ref_score+= 2*av_log2(2*ref)*c->penalty_factor;
         if(s->ref_mvs[ref]){