summaryrefslogtreecommitdiff
path: root/include/xine
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2011-10-11 09:17:51 +0100
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2011-10-11 09:17:51 +0100
commitb258a7d9c8f71669df3273127c076e722573f707 (patch)
treeff6d87fffb1e1154da9dfadaddab8376eea2f96f /include/xine
parentc7f63d6c87d5023ba65e3588bf37326e69b20430 (diff)
parent61087cfdd20dfabcbc1da7fd11f85815f9a667aa (diff)
downloadxine-lib-b258a7d9c8f71669df3273127c076e722573f707.tar.gz
xine-lib-b258a7d9c8f71669df3273127c076e722573f707.tar.bz2
Merge from 1.1.
--HG-- rename : src/xine-engine/post.h => include/xine/post.h rename : po/libxine1.pot => po/libxine2.pot
Diffstat (limited to 'include/xine')
-rw-r--r--include/xine/post.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/xine/post.h b/include/xine/post.h
index c15bab765..f0d0c9316 100644
--- a/include/xine/post.h
+++ b/include/xine/post.h
@@ -290,7 +290,7 @@ static inline post_video_port_t *_x_post_video_frame_to_port(vo_frame_t *frame)
static inline post_video_port_t *_x_post_ovl_manager_to_port(video_overlay_manager_t *manager) {
#ifdef POST_INTERNAL
return (post_video_port_t *)( (uint8_t *)manager -
- (unsigned)&(((post_video_port_t *)NULL)->manager_storage) );
+ (uint8_t*)&(((post_video_port_t *)NULL)->manager_storage) );
#else
return (post_video_port_t *)( (uint8_t *)manager - sizeof(post_video_port_t) );
#endif