--- C:\DOCUME~1\Ray\LOCALS~1\Temp\FFmpegDecoderVideo.cpp-revBASE.svn001.tmp.cpp	Mar 22 18:03:07 2009
+++ E:\OpenSceneGraph\src\osgPlugins\ffmpeg\FFmpegDecoderVideo.cpp	Mar 21 14:00:09 2009
@@ -233,7 +233,7 @@
     m_pixel_aspect_ratio = ratio;
 }
 
-int FFmpegDecoderVideo::convert(AVPicture *dst, int dst_pix_fmt, const AVPicture *src,
+int FFmpegDecoderVideo::convert(AVPicture *dst, int dst_pix_fmt, AVPicture *src,
             int src_pix_fmt, int src_width, int src_height)
 {
     osg::Timer_t startTick = osg::Timer::instance()->tick();
@@ -247,10 +247,13 @@
     
 
     osg::notify(osg::INFO)<<"Using sws_scale ";
-
+    
     int result =  sws_scale(m_swscale_ctx,
+                            (src->data), (src->linesize), 0, src_height,
+                            (dst->data), (dst->linesize));
+    /*int result =  sws_scale(m_swscale_ctx,
                             (const uint8_t**)(src->data), (src->linesize), 0, src_height,
-                            (dst->data), (dst->linesize));
+                            (dst->data), (dst->linesize));*/
 #else
 
     osg::notify(osg::INFO)<<"Using img_convert ";
@@ -276,7 +279,7 @@
     if (delay < -0.010)
         return;
         
-    const AVPicture * const src = (const AVPicture *) m_frame.get();
+    AVPicture * const src = (AVPicture *) m_frame.get();
     AVPicture * const dst = (AVPicture *) m_frame_rgba.get();
 
     // Assign appropriate parts of the buffer to image planes in m_frame_rgba
@@ -312,7 +315,7 @@
 
 
 
-void FFmpegDecoderVideo::yuva420pToRgba(AVPicture * const dst, const AVPicture * const src, int width, int height)
+void FFmpegDecoderVideo::yuva420pToRgba(AVPicture * const dst, AVPicture * const src, int width, int height)
 {
     convert(dst, PIX_FMT_RGB32, src, m_context->pix_fmt, width, height);