Merge commit '594d4d5df3c70404168701dd5c90b7e6e5587793'

[ffmpeg] / libavcodec / snowenc.c

diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c
index cbdf9781a88dcc50114b3028bb165afe4f3fd1f4..701a56d284495b387a11961912b62ae19442a1af 100644 (file)
--- a/libavcodec/snowenc.c
+++ b/libavcodec/snowenc.c
@@ -238,7 +238,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
     ff_set_cmp(&s->dsp, s->dsp.me_cmp, s->avctx->me_cmp);
     ff_set_cmp(&s->dsp, s->dsp.me_sub_cmp, s->avctx->me_sub_cmp);
 
-    s->avctx->get_buffer(s->avctx, &s->input_picture);
+    ff_get_buffer(s->avctx, &s->input_picture);
 
     if(s->avctx->me_method == ME_ITER){
         int i;
@@ -626,7 +626,7 @@ static int get_dc(SnowContext *s, int mb_x, int mb_y, int plane_index){
     }
     *b= backup;
 
-    return av_clip(((ab<<LOG2_OBMC_MAX) + aa/2)/aa, 0, 255); //FIXME we should not need clipping
+    return av_clip( ROUNDED_DIV(ab<<LOG2_OBMC_MAX, aa), 0, 255); //FIXME we should not need clipping
 }
 
 static inline int get_block_bits(SnowContext *s, int x, int y, int w){