videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-08-30 05:06:16 +02:00
Code Releases Activity

snow: fix build after 594d4d5df3

Browse Source
This commit is contained in:
Anton Khirnov 2012-12-05 06:34:02 +01:00
parent 92dad6687f
commit 380232fac3
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/snow.c
View File

@ -24,6 +24,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "dsputil.h" #include "dsputil.h"
#include "dwt.h" #include "dwt.h"
#include "internal.h"
#include "snow.h" #include "snow.h"
#include "snowdata.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++) for(j=0; j<MAX_REF_FRAMES; j++)
ff_scale_mv_ref[i][j] = 256*(i+1)/(j+1); 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"); av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return ret; return ret;
} }
@ -623,7 +624,7 @@ int ff_snow_frame_start(SnowContext *s){
} }
s->current_picture.reference= 1; 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"); av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return -1; return -1;
} }

3
libavcodec/snowenc.c
View File

@ -23,6 +23,7 @@
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "avcodec.h" #include "avcodec.h"
#include "dsputil.h" #include "dsputil.h"
#include "internal.h"
#include "dwt.h" #include "dwt.h"
#include "snow.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_cmp, s->avctx->me_cmp);
ff_set_cmp(&s->dsp, s->dsp.me_sub_cmp, s->avctx->me_sub_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){ if(s->avctx->me_method == ME_ITER){
int i; int i;