Mercurial > mplayer.hg
comparison libass/ass_parse.c @ 35701:c7866af24567
Updated libass to 7e45532
- Removes a redundant warning message
- Fixes a wrong condition
- Fixes a leak when an error occurs
author | SubJunk |
---|---|
date | Sat, 19 Jan 2013 21:47:31 +0000 |
parents | 49fc594fda43 |
children | c3aaaf17c721 |
comparison
equal
deleted
inserted
replaced
35700:7820bad7c1f8 | 35701:c7866af24567 |
---|---|
239 if (!res) | 239 if (!res) |
240 scale = 1; | 240 scale = 1; |
241 drawing->scale = scale; | 241 drawing->scale = scale; |
242 drawing->scale_x = render_priv->font_scale_x * render_priv->font_scale; | 242 drawing->scale_x = render_priv->font_scale_x * render_priv->font_scale; |
243 drawing->scale_y = render_priv->font_scale; | 243 drawing->scale_y = render_priv->font_scale; |
244 while (*p != ')' && *p != '}' && p != 0) | 244 while (*p != ')' && *p != '}' && *p != 0) |
245 ass_drawing_add_char(drawing, *p++); | 245 ass_drawing_add_char(drawing, *p++); |
246 skipopt(')'); | 246 skipopt(')'); |
247 | 247 |
248 return p; | 248 return p; |
249 } | 249 } |