From fe8822e4968fed45e29b0d15fba7ca6da74dbf46 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Thu, 20 Aug 2009 14:59:00 +0000
Subject: [PATCH] Added check against a minimual video size of 10x10 to prevent
 problems with swscale reporting errors and crashing on small video
 dimensionsline, and those below, will be ignored--

M    ffmpeg/FFmpegImageStream.cpp
---
 src/osgPlugins/ffmpeg/FFmpegImageStream.cpp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/osgPlugins/ffmpeg/FFmpegImageStream.cpp b/src/osgPlugins/ffmpeg/FFmpegImageStream.cpp
index f3b543cbe..de452c884 100644
--- a/src/osgPlugins/ffmpeg/FFmpegImageStream.cpp
+++ b/src/osgPlugins/ffmpeg/FFmpegImageStream.cpp
@@ -72,15 +72,23 @@ bool FFmpegImageStream::open(const std::string & filename)
         const_cast<unsigned char *>(m_decoder->video_decoder().image()), NO_DELETE
     );
 
+
     setPixelAspectRatio(m_decoder->video_decoder().pixelAspectRatio());
-    
+
+    osg::notify(osg::NOTICE)<<"ffmpeg::open("<<filename<<") size("<<s()<<", "<<t()<<") aspect ratio "<<m_decoder->video_decoder().pixelAspectRatio()<<std::endl;
+
+#if 1
+    // swscale is reported errors and then crashing when rescaling video of size less than 10 by 10.
+    if (s()<=10 || t()<=10) return false;
+#endif
+
     m_decoder->video_decoder().setUserData(this);
     m_decoder->video_decoder().setPublishCallback(publishNewFrame);
-    
+
     if (m_decoder->audio_decoder().validContext())
     {
         osg::notify(osg::NOTICE)<<"Attaching FFmpegAudioStream"<<std::endl;
-    
+
         getAudioStreams().push_back(new FFmpegAudioStream(m_decoder.get()));
     }