Changeset 9856

Timestamp:

03/04/09 12:46:34 (4 years ago)

Author:

robert

Message:

Fixed img_convert usage

Location:

OpenSceneGraph/trunk/src/osgPlugins/ffmpeg

Files:

• FFmpegDecoderVideo.cpp (modified) (2 diffs)
• FFmpegDecoderVideo.hpp (modified) (1 diff)

OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp

@@ -6 +6 @@
 #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 +224 @@
            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
 }

OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.hpp

@@ -123 +123 @@
     volatile bool           m_exit;
     
-#if USE_SWSCALE    
+#ifdef USE_SWSCALE    
     struct SwsContext *     m_swscale_ctx;
 #endif