From d0dabd26655db5760b7ffb9a00b30e55af490032 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Wed, 4 Mar 2009 11:46:34 +0000
Subject: [PATCH] Fixed img_convert usage

---
 src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp | 15 ++-------------
 src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp |  2 +-
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp b/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp
index 9fef131ce..cf4206803 100644
--- a/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp
+++ b/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp
@@ -5,19 +5,8 @@
 #include <stdexcept>
 #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) :
     m_packets(packets),
     m_clocks(clocks),
@@ -234,8 +223,8 @@ int FFmpegDecoderVideo::convert(AVPicture *dst, int dst_pix_fmt, const AVPicture
            src->data, src->linesize, 0, src_height,
            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
 }
 
diff --git a/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp b/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp
index 716588aed..9607b335c 100644
--- a/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp
+++ b/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp
@@ -122,7 +122,7 @@ private:
 
     volatile bool           m_exit;
     
-#if USE_SWSCALE    
+#ifdef USE_SWSCALE    
     struct SwsContext *     m_swscale_ctx;
 #endif
 };