summaryrefslogtreecommitdiffstats
path: root/libhb/hb.c
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2013-12-02 21:25:41 +0000
committerjstebbins <[email protected]>2013-12-02 21:25:41 +0000
commit87ba2a39cc223742796170d87a8563c2e64910d8 (patch)
tree12348638a37e6ec22aefeecc0b9cdbfd03332e16 /libhb/hb.c
parent6f68c72ba9055ced110782e250ae824ff076a23e (diff)
libhb: remove use of avpicture_deinterlace
This function is being remove from libav. so replace it's functionality with a threaded implementation of our own. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5911 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/hb.c')
-rw-r--r--libhb/hb.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/libhb/hb.c b/libhb/hb.c
index 760683d76..b9730802d 100644
--- a/libhb/hb.c
+++ b/libhb/hb.c
@@ -786,19 +786,11 @@ void hb_get_preview( hb_handle_t * h, hb_job_t * job, int picture,
if( job->deinterlace )
{
- int width = (in_buf->plane[0].width + 3) & ~0x3;
- int height = (in_buf->plane[0].height + 3) & ~0x3;
-
// Deinterlace and crop
- // avpicture_deinterlace requires 4 pixel aligned width and height
- // we have aligned all buffers to 16 byte width and height strides
- // so there is room in the buffers to accomodate a litte
- // overscan.
deint_buf = hb_frame_buffer_init( AV_PIX_FMT_YUV420P,
title->width, title->height );
+ hb_deinterlace(deint_buf, in_buf);
hb_avpicture_fill( &pic_deint, deint_buf );
- avpicture_deinterlace( &pic_deint, &pic_in, AV_PIX_FMT_YUV420P,
- width, height );
av_picture_crop( &pic_crop, &pic_deint, AV_PIX_FMT_YUV420P,
job->crop[0], job->crop[2] );