summaryrefslogtreecommitdiffstats
path: root/mpeglib/lib/mpegplay/mpegExtension.h
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-11 06:00:15 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-11 06:00:15 +0000
commitb1057f437bf65300831a0ccb45b920787c6b318d (patch)
treef8a73db06ca1180d0da0ba6dfbe786197b4f4bc3 /mpeglib/lib/mpegplay/mpegExtension.h
parent4ddfca384ced9ad654213aef9dc2c3973720b980 (diff)
downloadtdemultimedia-b1057f437bf65300831a0ccb45b920787c6b318d.tar.gz
tdemultimedia-b1057f437bf65300831a0ccb45b920787c6b318d.zip
TQt4 port kdemultimedia
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1236079 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'mpeglib/lib/mpegplay/mpegExtension.h')
-rw-r--r--mpeglib/lib/mpegplay/mpegExtension.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/mpeglib/lib/mpegplay/mpegExtension.h b/mpeglib/lib/mpegplay/mpegExtension.h
index 23b79c5b..3b0f1680 100644
--- a/mpeglib/lib/mpegplay/mpegExtension.h
+++ b/mpeglib/lib/mpegplay/mpegExtension.h
@@ -43,7 +43,7 @@ class MpegExtension {
private:
char* get_extra_bit_info(MpegVideoStream* mpegVideoStream);
- int next_bits(int num,unsigned int mask,MpegVideoStream* input);
+ int next_bits(int num,unsigned int tqmask,MpegVideoStream* input);
};
#endif