diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 18:25:34 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 18:25:34 +0300 |
commit | 7795726e0f8c70edd6ecde7fd2137214af302f4f (patch) | |
tree | 87a087e69a0e2912183736de409676f824fb2248 /DOCS/tech/osd.txt | |
parent | ba3b65b92f3f822fa75b0210b841557f5b20f6d1 (diff) | |
parent | e16f02fe4001f3056b8efd1a099a563569b73f5d (diff) | |
download | mpv-7795726e0f8c70edd6ecde7fd2137214af302f4f.tar.bz2 mpv-7795726e0f8c70edd6ecde7fd2137214af302f4f.tar.xz |
Merge svn changes up to r31033
Diffstat (limited to 'DOCS/tech/osd.txt')
-rw-r--r-- | DOCS/tech/osd.txt | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/DOCS/tech/osd.txt b/DOCS/tech/osd.txt index e4af53fe09..7e7376745f 100644 --- a/DOCS/tech/osd.txt +++ b/DOCS/tech/osd.txt @@ -51,36 +51,36 @@ typedef struct mp_osd_obj_s { unsigned char type; unsigned char alignment; // 2 bits: x;y percentages, 2 bits: x;y relative to parent; 2 bits: alignment left/right/center unsigned short flags; - int x,y; // coords + int x,y; // coords unsigned char color[4]; // YUVA mp_osd_bbox_t bbox; // bounding box unsigned int start,duration; // PTS union { - struct { - int x1,y1,x2,y2; - } line; - struct { - int x,y,w,h; - } rect; - struct { - char* text; - mp_font_t* font; - } text; - struct { - int symbol; // unicode - mp_font_t* font; - } symbol; - struct { - float value; - mp_font_t* font; - } pbar; - struct { - int w,h; - unsigned char* image; - unsigned int* palette; - } spu; // FIXME! - struct { - struct mp_osd_obj_s* children; - } group; + struct { + int x1,y1,x2,y2; + } line; + struct { + int x,y,w,h; + } rect; + struct { + char* text; + mp_font_t* font; + } text; + struct { + int symbol; // unicode + mp_font_t* font; + } symbol; + struct { + float value; + mp_font_t* font; + } pbar; + struct { + int w,h; + unsigned char* image; + unsigned int* palette; + } spu; // FIXME! + struct { + struct mp_osd_obj_s* children; + } group; } params; } mp_osd_obj_t; |