mirror of https://github.com/mpv-player/mpv
cc05910f16
Move sub-bitmap definitions from dec_sub.h to sub.h. While it's a bit odd that OSD data structures are in a file named sub.h, it's definitely way too strange to have them in a file about subtitle decoding. (Maybe sub.h/.c and the sub/ directory should be split out and renamed "osd" at a later point.) Remove including ass_mp.h (and the libass headers) where possible. Remove typedefs for mp_eosd_res and sub_bitmaps structs. Store a mp_eosd_res struct in osd_state instead of just w/h. Note that sbtitles might be rendered using different sizes/margins when filters are involved (the subtitle renderer is not supposed to use the OSD res directly, and the "dim" member removed in the previous commit is something different). |
||
|---|---|---|
| .. | ||
| ass_mp.c | ||
| ass_mp.h | ||
| dec_sub.c | ||
| dec_sub.h | ||
| find_sub.c | ||
| find_subfiles.c | ||
| find_subfiles.h | ||
| img_convert.c | ||
| img_convert.h | ||
| osd_dummy.c | ||
| osd_font.pfb | ||
| osd_libass.c | ||
| sd.h | ||
| sd_ass.c | ||
| sd_lavc.c | ||
| spudec.c | ||
| spudec.h | ||
| sub.c | ||
| sub.h | ||
| subassconvert.c | ||
| subassconvert.h | ||
| subreader.c | ||
| subreader.h | ||
| vobsub.c | ||
| vobsub.h | ||