DVCPRO fix

git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@725 d19143bc-622f-0410-bfdd-b5b2a6649095

diff --git a/src/modules/kino/filehandler.cc b/src/modules/kino/filehandler.cc
index 740ee560c6ac0f8846d0ec5d9851d7e82ba7e672..5c4de5249202a335e44265fa90dd11d82c3683e6 100644 (file)
--- a/src/modules/kino/filehandler.cc
+++ b/src/modules/kino/filehandler.cc
@@ -863,9 +863,11 @@ bool QtHandler::Open( const char *s )
                Close();
                return false;
        }
-       if ( strncmp( quicktime_video_compressor( fd, 0 ), QUICKTIME_DV, 4 ) != 0 )
+       char * fcc = quicktime_video_compressor( fd, 0 );
+       if ( strncmp( fcc, QUICKTIME_DV, 4 ) != 0 &&
+            strncmp( fcc, QUICKTIME_DV_AVID, 4 ) != 0 &&
+            strncmp( fcc, QUICKTIME_DV_AVID_A, 4 ) != 0 )
        {
-               fprintf( stderr, "Video in input file (%s) must be in DV format.\n", s );
                Close();
                return false;
        }

diff --git a/src/modules/kino/filehandler.h b/src/modules/kino/filehandler.h
index 665795191a3849bd30d56153c9bf0e50831de998..7b7d5ab07bc469d8925e737f69e44514c14213fc 100644 (file)
--- a/src/modules/kino/filehandler.h
+++ b/src/modules/kino/filehandler.h
@@ -180,7 +180,7 @@ protected:
 
 
 #ifdef HAVE_LIBQUICKTIME
-#include <quicktime/quicktime.h>
+#include <quicktime.h>
 
 class QtHandler: public FileHandler
 {