Mercurial > mplayer.hg
comparison libmpcodecs/vf.c @ 30807:82dd2fbdb772
Enable ASS/SSA subtitle support in mencoder
Enable ASS/SSA rendering through libass in mencoder. This duplicates a
bit of code (to parse font attachments, for example). Additionally, add
a filter "fixpts" that generates PTS, simulating fixed fps. PTS
generated by this filter are then used for subtitle timing.
Original patch by Nicolas George. (nicolas.george normalesup.org)
author | greg |
---|---|
date | Fri, 05 Mar 2010 23:13:08 +0000 |
parents | a972c1a4a012 |
children | 00825525514e |
comparison
equal
deleted
inserted
replaced
30806:5e7d1ade0858 | 30807:82dd2fbdb772 |
---|---|
116 extern const vf_info_t vf_info_mcdeint; | 116 extern const vf_info_t vf_info_mcdeint; |
117 extern const vf_info_t vf_info_yadif; | 117 extern const vf_info_t vf_info_yadif; |
118 extern const vf_info_t vf_info_blackframe; | 118 extern const vf_info_t vf_info_blackframe; |
119 extern const vf_info_t vf_info_geq; | 119 extern const vf_info_t vf_info_geq; |
120 extern const vf_info_t vf_info_ow; | 120 extern const vf_info_t vf_info_ow; |
121 extern const vf_info_t vf_info_fixpts; | |
121 | 122 |
122 // list of available filters: | 123 // list of available filters: |
123 static const vf_info_t* const filter_list[]={ | 124 static const vf_info_t* const filter_list[]={ |
124 &vf_info_rectangle, | 125 &vf_info_rectangle, |
125 #ifdef HAVE_POSIX_SELECT | 126 #ifdef HAVE_POSIX_SELECT |
209 &vf_info_ass, | 210 &vf_info_ass, |
210 #endif | 211 #endif |
211 &vf_info_yadif, | 212 &vf_info_yadif, |
212 &vf_info_blackframe, | 213 &vf_info_blackframe, |
213 &vf_info_ow, | 214 &vf_info_ow, |
215 &vf_info_fixpts, | |
214 NULL | 216 NULL |
215 }; | 217 }; |
216 | 218 |
217 // For the vf option | 219 // For the vf option |
218 m_obj_settings_t* vf_settings = NULL; | 220 m_obj_settings_t* vf_settings = NULL; |