X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Fdeinterlace.c;h=78856dd13960c218f2bb5785561435e80982e771;hb=44946a6f8be82a70e65ca534541183a26fdb804b;hp=9e4c33eb4551531cc4448f60fdb1e02070ea43a5;hpb=adf038bc3ba9c3207133b4f8a8ffc43296d35819;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/libhb/deinterlace.c b/libhb/deinterlace.c index 9e4c33eb..78856dd1 100644 --- a/libhb/deinterlace.c +++ b/libhb/deinterlace.c @@ -17,7 +17,7 @@ */ #include "hb.h" -#include "libavcodec/avcodec.h" +#include "hbffmpeg.h" #include "mpeg2dec/mpeg2.h" #define SUPPRESS_AV_LOG @@ -531,9 +531,8 @@ hb_filter_private_t * hb_deinterlace_init( int pix_fmt, pv->width[1] = pv->width[2] = width >> 1; pv->height[1] = pv->height[2] = height >> 1; - int buf_size = 3 * width * height / 2; - pv->buf_out[0] = hb_buffer_init( buf_size ); - pv->buf_out[1] = hb_buffer_init( buf_size ); + pv->buf_out[0] = hb_video_buffer_init( width, height ); + pv->buf_out[1] = hb_video_buffer_init( width, height ); pv->buf_settings = hb_buffer_init( 0 ); pv->yadif_ready = 0; @@ -654,7 +653,7 @@ hb_filter_private_t * hb_deinterlace_init( int pix_fmt, avctx_enc->flags |= CODEC_FLAG_QPEL; } - avcodec_open(avctx_enc, enc); + hb_avcodec_open(avctx_enc, enc); } pv->mcdeint_frame = avcodec_alloc_frame(); @@ -727,7 +726,7 @@ void hb_deinterlace_close( hb_filter_private_t * pv ) { if( pv->mcdeint_avctx_enc ) { - avcodec_close( pv->mcdeint_avctx_enc ); + hb_avcodec_close( pv->mcdeint_avctx_enc ); av_freep( &pv->mcdeint_avctx_enc ); } if( pv->mcdeint_outbuf )