diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 23:44:57 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 23:44:57 +0200 |
| commit | 89c5ed5e9a720b032af9a58263deda158e1cbf4d (patch) | |
| tree | 2afd33bf8cd2692201b78a0a2da80824780efc63 /libvo/vo_dxr3.c | |
| parent | 0670a5d0905db1e4bbf376cf005ca836f4d0e04b (diff) | |
| parent | cdd0ab0da9818aeb527e35fe73ee57bdf3aa4f70 (diff) | |
| download | mpv-89c5ed5e9a720b032af9a58263deda158e1cbf4d.tar.bz2 mpv-89c5ed5e9a720b032af9a58263deda158e1cbf4d.tar.xz | |
Merge svn changes up to r30605
Diffstat (limited to 'libvo/vo_dxr3.c')
| -rw-r--r-- | libvo/vo_dxr3.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libvo/vo_dxr3.c b/libvo/vo_dxr3.c index 898ee96756..b824f8b71e 100644 --- a/libvo/vo_dxr3.c +++ b/libvo/vo_dxr3.c @@ -437,13 +437,13 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_ mp_tmsg(MSGT_VO,MSGL_ERR, "[VO_DXR3] out of memory\n"); return -1; } - spued = (encodedata *) malloc(sizeof(encodedata)); + spued = malloc(sizeof(encodedata)); if (spued == NULL) { free( osdpicbuf ); mp_tmsg(MSGT_VO,MSGL_ERR, "[VO_DXR3] out of memory\n"); return -1; } - spubuf = (encodedata *) malloc(sizeof(encodedata)); + spubuf = malloc(sizeof(encodedata)); if (spubuf == NULL) { free( osdpicbuf ); free( spued ); @@ -903,7 +903,7 @@ static overlay_t *overlay_init(int dev) { overlay_t *o; - o = (overlay_t *) malloc(sizeof(overlay_t)); + o = malloc(sizeof(overlay_t)); if(!o) return NULL; |