Changeset 9857 for OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp

Timestamp:

03/04/09 12:59:15 (4 years ago)

Author:

robert

Message:

Fixes to non swscale code path

Files:

• OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoderVideo.cpp (modified) (4 diffs)

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

@@ -19 +19 @@
     m_user_data(0),
     m_publish_func(0),
-    m_exit(false),
-    m_swscale_ctx(0)
+    m_exit(false)
+#ifdef USE_SWSCALE
+    ,m_swscale_ctx(0)
+#endif
 {
 
@@ -35 +37 @@
     }
     
+#ifdef USE_SWSCALE
     if (m_swscale_ctx)
     {
@@ -40 +43 @@
         m_swscale_ctx = 0;
     }
+#endif
 }
 
@@ -220 +224 @@
     }
     
+    osg::notify(osg::NOTICE)<<"Using sws_scale"<<std::endl;
+
     return sws_scale(m_swscale_ctx,
            src->data, src->linesize, 0, src_height,
            dst->data, dst->linesize);
 #else
-    return im_convert(dst, dst_pix_fmt, src,
-                      src_pix_fmt, src_width, src_height)
+    osg::notify(osg::NOTICE)<<"Using img_convert"<<std::endl;
+
+    return img_convert(dst, dst_pix_fmt, src,
+                      src_pix_fmt, src_width, src_height);
 #endif
 }