summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew den Exter <andrew.den-exter@nokia.com>2010-02-11 03:20:10 (GMT)
committerAndrew den Exter <andrew.den-exter@nokia.com>2010-02-11 03:20:10 (GMT)
commit7c8835b2dd350978ebb226c15d1a3c9d03f683e2 (patch)
treee7fc6ace6b91f23ef3dc4a5e32fe1f995642035d
parent510d619f86c3f5464e05ab4d27b3f5eddd7b5135 (diff)
downloadQt-7c8835b2dd350978ebb226c15d1a3c9d03f683e2.zip
Qt-7c8835b2dd350978ebb226c15d1a3c9d03f683e2.tar.gz
Qt-7c8835b2dd350978ebb226c15d1a3c9d03f683e2.tar.bz2
Don't call free() on 'this' in DirectShowMediaType.
The correct function is freeData().
-rw-r--r--src/plugins/mediaservices/directshow/mediaplayer/directshowmediatype.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/mediaservices/directshow/mediaplayer/directshowmediatype.h b/src/plugins/mediaservices/directshow/mediaplayer/directshowmediatype.h
index 3ba907e..3cc7307 100644
--- a/src/plugins/mediaservices/directshow/mediaplayer/directshowmediatype.h
+++ b/src/plugins/mediaservices/directshow/mediaplayer/directshowmediatype.h
@@ -60,9 +60,9 @@ public:
DirectShowMediaType(const AM_MEDIA_TYPE &type) { copy(this, type); }
DirectShowMediaType(const DirectShowMediaType &other) { copy(this, other); }
DirectShowMediaType &operator =(const AM_MEDIA_TYPE &type) {
- free(this); copy(this, type); return *this; }
+ freeData(this); copy(this, type); return *this; }
DirectShowMediaType &operator =(const DirectShowMediaType &other) {
- free(this); copy(this, other); return *this; }
+ freeData(this); copy(this, other); return *this; }
~DirectShowMediaType() { freeData(this); }
void clear() { freeData(this); memset(this, 0, sizeof(DirectShowMediaType)); }