equal
deleted
inserted
replaced
40 ****************************************************************************/ |
40 ****************************************************************************/ |
41 |
41 |
42 #include <QtCore/qvariant.h> |
42 #include <QtCore/qvariant.h> |
43 #include <QtCore/qdebug.h> |
43 #include <QtCore/qdebug.h> |
44 #include <QtGui/qx11info_x11.h> |
44 #include <QtGui/qx11info_x11.h> |
45 #include <QtMultimedia/qvideosurfaceformat.h> |
45 #include <qvideosurfaceformat.h> |
|
46 |
|
47 #ifndef QT_NO_XVIDEO |
46 |
48 |
47 #include "qx11videosurface.h" |
49 #include "qx11videosurface.h" |
48 |
50 |
49 Q_DECLARE_METATYPE(XvImage*); |
51 Q_DECLARE_METATYPE(XvImage*); |
50 |
52 |
528 } |
530 } |
529 |
531 |
530 XFree(attributes); |
532 XFree(attributes); |
531 } |
533 } |
532 } |
534 } |
|
535 |
|
536 #endif //QT_NO_XVIDEO |
|
537 |