Merge commit '5adcef9c1bf701ba2dd43363ae983ba6d74bdb9a'

[ffmpeg] / libavcodec / snowenc.c

diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c
index 167b205cba6bf55d312ad75cad8abf29198d9c8b..cb8382154ddf8cc226b8aa9df22083ca0d9ba967 100644 (file)
--- a/libavcodec/snowenc.c
+++ b/libavcodec/snowenc.c
@@ -37,6 +37,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
 {
     SnowContext *s = avctx->priv_data;
     int plane_index, ret;
+    int i;
 
     if(avctx->prediction_method == DWT_97
        && (avctx->flags & CODEC_FLAG_QSCALE)
@@ -124,11 +125,11 @@ static av_cold int encode_init(AVCodecContext *avctx)
     s->input_picture = av_frame_alloc();
     if (!s->input_picture)
         return AVERROR(ENOMEM);
-    if ((ret = ff_get_buffer(s->avctx, s->input_picture, AV_GET_BUFFER_FLAG_REF)) < 0)
+
+    if ((ret = ff_snow_get_buffer(s, s->input_picture)) < 0)
         return ret;
 
     if(s->avctx->me_method == ME_ITER){
-        int i;
         int size= s->b_width * s->b_height << 2*s->block_max_depth;
         for(i=0; i<s->max_ref_frames; i++){
             s->ref_mvs[i]= av_mallocz_array(size, sizeof(int16_t[2]));
@@ -1567,10 +1568,10 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
             memcpy(&s->input_picture->data[i][y * s->input_picture->linesize[i]],
                    &pict->data[i][y * pict->linesize[i]],
                    width>>hshift);
-        s->dsp.draw_edges(s->input_picture->data[i], s->input_picture->linesize[i],
-                            width >> hshift, height >> vshift,
-                            EDGE_WIDTH >> hshift, EDGE_WIDTH >> vshift,
-                            EDGE_TOP | EDGE_BOTTOM);
+        s->mpvencdsp.draw_edges(s->input_picture->data[i], s->input_picture->linesize[i],
+                                width >> hshift, height >> vshift,
+                                EDGE_WIDTH >> hshift, EDGE_WIDTH >> vshift,
+                                EDGE_TOP | EDGE_BOTTOM);
 
     }
     emms_c();