diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 01:46:46 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 01:50:55 +0200 |
| commit | e74708f6194ef0af2bdf37e857ed232027fa46ba (patch) | |
| tree | f7b53476abeb1cc8ccbe1c49113e9722c51b7800 /loader/dmo | |
| parent | 2ad00b5319603b22f9b0858bb14d016f673157cb (diff) | |
| parent | cb8796857c8bd851e3b97d729af149e3f003b851 (diff) | |
| download | mpv-e74708f6194ef0af2bdf37e857ed232027fa46ba.tar.bz2 mpv-e74708f6194ef0af2bdf37e857ed232027fa46ba.tar.xz | |
Merge svn changes up to r30748
Diffstat (limited to 'loader/dmo')
| -rw-r--r-- | loader/dmo/buffer.c | 4 | ||||
| -rw-r--r-- | loader/dmo/dmo.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/loader/dmo/buffer.c b/loader/dmo/buffer.c index 70883b9abe..78428e249f 100644 --- a/loader/dmo/buffer.c +++ b/loader/dmo/buffer.c @@ -69,12 +69,12 @@ IMPLEMENT_IUNKNOWN(CMediaBuffer) CMediaBuffer* CMediaBufferCreate(unsigned long maxlen, void* mem, unsigned long len, int copy) { - CMediaBuffer* This = (CMediaBuffer*) malloc(sizeof(CMediaBuffer)); + CMediaBuffer* This = malloc(sizeof(CMediaBuffer)); if (!This) return NULL; - This->vt = (IMediaBuffer_vt*) malloc(sizeof(IMediaBuffer_vt)); + This->vt = malloc(sizeof(IMediaBuffer_vt)); if (!This->vt) { CMediaBuffer_Destroy(This); diff --git a/loader/dmo/dmo.c b/loader/dmo/dmo.c index f8898efcb5..0ca7cf3206 100644 --- a/loader/dmo/dmo.c +++ b/loader/dmo/dmo.c @@ -36,7 +36,7 @@ DMO_Filter* DMO_FilterCreate(const char* dllname, const GUID* id, { HRESULT hr = 0; const char* em = NULL; - DMO_Filter* This = (DMO_Filter*) malloc(sizeof(DMO_Filter)); + DMO_Filter* This = malloc(sizeof(DMO_Filter)); if (!This) return NULL; |