summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-05-25 11:48:58 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-05-25 11:48:58 +0000
commit3c9ef55e0a4103a8c27388727f0741cf2905dfe6 (patch)
tree48689adbe54e3aca2e23b068208b1aff778bac5f /libmpdemux
parent8d6814a3da2ed5577b046a3ad944a40b92eee009 (diff)
downloadmpv-3c9ef55e0a4103a8c27388727f0741cf2905dfe6.tar.bz2
mpv-3c9ef55e0a4103a8c27388727f0741cf2905dfe6.tar.xz
Specify the padding instead of expecting the compiler to align correctly
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15569 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/nuppelvideo.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/libmpdemux/nuppelvideo.h b/libmpdemux/nuppelvideo.h
index 2e9dc51562..44c63384d5 100644
--- a/libmpdemux/nuppelvideo.h
+++ b/libmpdemux/nuppelvideo.h
@@ -1,15 +1,17 @@
/* nuppelvideo.h rh */
-typedef struct rtfileheader
+typedef struct __attribute__((packed)) rtfileheader
{
char finfo[12]; // "NuppelVideo" + \0
char version[5]; // "0.05" + \0
+ char pad1[3];
int width;
int height;
int desiredwidth; // 0 .. as it is
int desiredheight; // 0 .. as it is
char pimode; // P .. progressive
// I .. interlaced (2 half pics) [NI]
+ char pad2[3];
double aspect; // 1.0 .. square pixel (1.5 .. e.g. width=480: width*1.5=720
// for capturing for svcd material
double fps;
@@ -19,7 +21,7 @@ typedef struct rtfileheader
int keyframedist;
} rtfileheader;
-typedef struct rtframeheader
+typedef struct __attribute__((packed)) rtframeheader
{
char frametype; // A .. Audio, V .. Video, S .. Sync, T .. Text
// R .. Seekpoint: String RTjjjjjjjj (use full packet)