[FFmpeg-cvslog] snow: fix build after 594d4d5df3c70404168701dd5c90b7e6e5587793

Anton Khirnov git at videolan.org
Sat Dec 8 13:55:35 CET 2012


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Wed Dec  5 06:34:02 2012 +0100| [380232fac3a6ca6f661f3d14e31308d3059c5c72] | committer: Anton Khirnov

snow: fix build after 594d4d5df3c70404168701dd5c90b7e6e5587793

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

 libavcodec/snow.c    |    5 +++--
 libavcodec/snowenc.c |    3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/libavcodec/snow.c b/libavcodec/snow.c
index fce4562..b9dab45 100644
--- a/libavcodec/snow.c
+++ b/libavcodec/snow.c
@@ -24,6 +24,7 @@
 #include "avcodec.h"
 #include "dsputil.h"
 #include "dwt.h"
+#include "internal.h"
 #include "snow.h"
 #include "snowdata.h"
 
@@ -458,7 +459,7 @@ av_cold int ff_snow_common_init(AVCodecContext *avctx){
         for(j=0; j<MAX_REF_FRAMES; j++)
             ff_scale_mv_ref[i][j] = 256*(i+1)/(j+1);
 
-    if ((ret = s->ff_get_buffer(s->avctx, &s->mconly_picture)) < 0) {
+    if ((ret = ff_get_buffer(s->avctx, &s->mconly_picture)) < 0) {
         av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n");
         return ret;
     }
@@ -623,7 +624,7 @@ int ff_snow_frame_start(SnowContext *s){
     }
 
     s->current_picture.reference= 1;
-    if(s->ff_get_buffer(s->avctx, &s->current_picture) < 0){
+    if(ff_get_buffer(s->avctx, &s->current_picture) < 0){
         av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n");
         return -1;
     }
diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c
index e60cb65..f93c53f 100644
--- a/libavcodec/snowenc.c
+++ b/libavcodec/snowenc.c
@@ -23,6 +23,7 @@
 #include "libavutil/opt.h"
 #include "avcodec.h"
 #include "dsputil.h"
+#include "internal.h"
 #include "dwt.h"
 #include "snow.h"
 
@@ -239,7 +240,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->ff_get_buffer(s->avctx, &s->input_picture);
+    ff_get_buffer(s->avctx, &s->input_picture);
 
     if(s->avctx->me_method == ME_ITER){
         int i;



More information about the ffmpeg-cvslog mailing list