From afbd06d8d6151b69bbb18adf83cfab8d680c3946 Mon Sep 17 00:00:00 2001
From: van <vanj.hb@gmail.com>
Date: Sat, 31 May 2008 17:00:42 +0000
Subject: - support blu-ray, avchd & dvb x264 - support video files handled by
 ffmpeg (avi, mkv, mp4, etc.)

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1480 b64f7644-9d1e-0410-96f1-a4d463321fa5
---
 libhb/decomb.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'libhb/decomb.c')

diff --git a/libhb/decomb.c b/libhb/decomb.c
index e5779c8fa..e29f253e6 100644
--- a/libhb/decomb.c
+++ b/libhb/decomb.c
@@ -6,7 +6,7 @@
    
    The yadif algorithm was created by Michael Niedermayer. */
 #include "hb.h"
-#include "ffmpeg/avcodec.h"
+#include "libavcodec/avcodec.h"
 #include "mpeg2dec/mpeg2.h"
 
 #define SUPPRESS_AV_LOG
@@ -69,7 +69,7 @@ hb_filter_private_t * hb_decomb_init( int pix_fmt,
                                            int height,
                                            char * settings );
 
-int hb_decomb_work( hb_buffer_t * buf_in,
+int hb_decomb_work(      const hb_buffer_t * buf_in,
                          hb_buffer_t ** buf_out,
                          int pix_fmt,
                          int width,
@@ -825,13 +825,15 @@ void hb_decomb_close( hb_filter_private_t * pv )
     free( pv );
 }
 
-int hb_decomb_work( hb_buffer_t * buf_in,
-                         hb_buffer_t ** buf_out,
-                         int pix_fmt,
-                         int width,
-                         int height,
-                         hb_filter_private_t * pv )
+int hb_decomb_work( const hb_buffer_t * cbuf_in,
+                    hb_buffer_t ** buf_out,
+                    int pix_fmt,
+                    int width,
+                    int height,
+                    hb_filter_private_t * pv )
 {
+    hb_buffer_t * buf_in = (hb_buffer_t *)cbuf_in;
+
     if( !pv ||
         pix_fmt != pv->pix_fmt ||
         width   != pv->width[0] ||
-- 
cgit v1.2.3