diff options
| author | eugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-08-29 18:15:48 +0000 |
|---|---|---|
| committer | eugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-08-29 18:15:48 +0000 |
| commit | 4c6dde8817beeed8dca8c5f0259b7d526f125b1e (patch) | |
| tree | 234fe534e15529068ab78898feca431770d4cfd1 /libass | |
| parent | e1537c82b10b46d2e6a5cc9d1e6ed3008c5b2701 (diff) | |
| download | mpv-4c6dde8817beeed8dca8c5f0259b7d526f125b1e.tar.bz2 mpv-4c6dde8817beeed8dca8c5f0259b7d526f125b1e.tar.xz | |
Bugfix: strdup of NULL value.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19594 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libass')
| -rw-r--r-- | libass/ass_mp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libass/ass_mp.c b/libass/ass_mp.c index 1d5061dfec..a01cdce334 100644 --- a/libass/ass_mp.c +++ b/libass/ass_mp.c @@ -48,7 +48,7 @@ ass_track_t* ass_read_subdata(sub_data* subdata, double fps) { sid = ass_alloc_style(track); style = track->styles + sid; style->Name = strdup("Default"); - style->FontName = font_fontconfig ? strdup(font_name) : strdup("Tahoma"); + style->FontName = (font_fontconfig && font_name) ? strdup(font_name) : strdup("Tahoma"); fs = track->PlayResY * text_font_scale_factor / 100. / ass_internal_font_size_coeff; // approximate autoscale coefficients |