diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-05-09 20:08:16 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-05-09 20:08:16 +0100 |
| commit | 795202860a4113f540a6a8728e272166d41158a4 (patch) | |
| tree | 45571360f0767a26c8e7dacc867a111d975fd790 | |
| parent | 8532f9356cdbd6585c5d9eaf5d92588ae7ddecbe (diff) | |
| parent | f1d7678b8e1657f40fe12dc55f47d030cb87aefd (diff) | |
| download | xine-lib-795202860a4113f540a6a8728e272166d41158a4.tar.gz xine-lib-795202860a4113f540a6a8728e272166d41158a4.tar.bz2 | |
Merge.
| -rw-r--r-- | src/video_out/video_out_xvmc.c | 2 | ||||
| -rw-r--r-- | src/video_out/video_out_xxmc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/video_out/video_out_xvmc.c b/src/video_out/video_out_xvmc.c index 890e079a6..79c2a80a3 100644 --- a/src/video_out/video_out_xvmc.c +++ b/src/video_out/video_out_xvmc.c @@ -556,7 +556,7 @@ static vo_frame_t *xvmc_alloc_frame (vo_driver_t *this_gen) { lprintf ("xvmc_alloc_frame\n"); - frame = calloc(1, (sizeof (xvmc_frame_t)); + frame = calloc(1, sizeof (xvmc_frame_t)); if (!frame) return NULL; diff --git a/src/video_out/video_out_xxmc.c b/src/video_out/video_out_xxmc.c index 0fedde6c6..b016a8bd1 100644 --- a/src/video_out/video_out_xxmc.c +++ b/src/video_out/video_out_xxmc.c @@ -162,7 +162,7 @@ static void xxmc_xvmc_surface_handler_construct(xxmc_driver_t *this) xvmc_surface_handler_t *handler = &this->xvmc_surf_handler; pthread_mutex_init(&handler->mutex,NULL); - memset(handler->surfInUse, 0, sizeof(handler->surfInuse)); + memset(handler->surfInUse, 0, sizeof(handler->surfInUse)); memset(handler->surfValid, 0, sizeof(handler->surfValid)); memset(handler->subInUse, 0, sizeof(handler->subInUse)); memset(handler->subValid, 0, sizeof(handler->subValid)); |