Index: /OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp
===================================================================
--- /OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp (revision 9854)
+++ /OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp (revision 9856)
@@ -6,16 +6,5 @@
 #include <string.h>
 
-#if 0
-extern "C" 
-{
-    int img_convert(AVPicture *dst, int dst_pix_fmt, const AVPicture *src,
-                int src_pix_fmt, int src_width, int src_height);
-
-};
-#endif
-
 namespace osgFFmpeg {
-
-
 
 FFmpegDecoderVideo::FFmpegDecoderVideo(PacketQueue & packets, FFmpegClocks & clocks) :
@@ -235,6 +224,6 @@
            dst->data, dst->linesize);
 #else
-    return convert(dst, dst_pix_fmt, src,
-                   src_pix_fmt, src_width, src_height)
+    return im_convert(dst, dst_pix_fmt, src,
+                      src_pix_fmt, src_width, src_height)
 #endif
 }
Index: /OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp
===================================================================
--- /OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp (revision 9854)
+++ /OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp (revision 9856)
@@ -123,5 +123,5 @@
     volatile bool           m_exit;
     
-#if USE_SWSCALE    
+#ifdef USE_SWSCALE    
     struct SwsContext *     m_swscale_ctx;
 #endif