Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
0202d37d
Commit
0202d37d
authored
Apr 19, 2011
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Required libass 0.9.8
parent
5546a96b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
23 deletions
+2
-23
configure.ac
configure.ac
+1
-1
modules/codec/libass.c
modules/codec/libass.c
+1
-22
No files found.
configure.ac
View file @
0202d37d
...
...
@@ -2980,7 +2980,7 @@ dnl
AC_ARG_ENABLE(libass,
[ --enable-libass Subtitle support using libass (default enabled)])
AS_IF( [test "${enable_libass}" != "no"], [
PKG_CHECK_MODULES(LIBASS, libass >= 0.9.
6
,
PKG_CHECK_MODULES(LIBASS, libass >= 0.9.
8
,
[
VLC_ADD_LIBS([libass],[$LIBASS_LIBS])
VLC_ADD_CFLAGS([libass],[$LIBASS_CFLAGS])
...
...
modules/codec/libass.c
View file @
0202d37d
...
...
@@ -46,14 +46,6 @@
# include <vlc_charset.h>
#endif
/* Compatibility with old libass */
#if !defined(LIBASS_VERSION) || LIBASS_VERSION < 0x00907010
# define ASS_Renderer ass_renderer_t
# define ASS_Library ass_library_t
# define ASS_Track ass_track_t
# define ASS_Image ass_image_t
#endif
/*****************************************************************************
* Module descriptor
*****************************************************************************/
...
...
@@ -337,12 +329,7 @@ static int SubpictureValidate( subpicture_t *p_subpic,
ass_set_frame_size
(
p_ass
->
p_renderer
,
fmt
.
i_width
,
fmt
.
i_height
);
const
double
src_ratio
=
(
double
)
p_fmt_src
->
i_width
/
p_fmt_src
->
i_height
;
const
double
dst_ratio
=
(
double
)
p_fmt_dst
->
i_width
/
p_fmt_dst
->
i_height
;
const
double
factor
=
dst_ratio
/
src_ratio
;
#if defined( LIBASS_VERSION ) && LIBASS_VERSION >= 0x00907000
ass_set_aspect_ratio
(
p_ass
->
p_renderer
,
factor
,
1
);
#else
ass_set_aspect_ratio
(
p_ass
->
p_renderer
,
factor
);
#endif
ass_set_aspect_ratio
(
p_ass
->
p_renderer
,
dst_ratio
/
src_ratio
,
1
);
p_ass
->
fmt
=
fmt
;
}
...
...
@@ -744,11 +731,7 @@ static ass_handle_t *AssHandleHold( decoder_t *p_dec )
if
(
p_dialog
)
dialog_ProgressSet
(
p_dialog
,
NULL
,
0
.
2
);
#endif
#if defined( LIBASS_VERSION ) && LIBASS_VERSION >= 0x00907000
ass_set_fonts
(
p_renderer
,
psz_font
,
psz_family
,
true
,
NULL
,
1
);
// setup default font/family
#else
ass_set_fonts
(
p_renderer
,
psz_font
,
psz_family
);
// setup default font/family
#endif
#ifdef WIN32
if
(
p_dialog
)
{
...
...
@@ -759,11 +742,7 @@ static ass_handle_t *AssHandleHold( decoder_t *p_dec )
#endif
#else
/* FIXME you HAVE to give him a font if no fontconfig */
#if defined( LIBASS_VERSION ) && LIBASS_VERSION >= 0x00907000
ass_set_fonts
(
p_renderer
,
psz_font
,
psz_family
,
false
,
NULL
,
1
);
#else
ass_set_fonts_nofc
(
p_renderer
,
psz_font
,
psz_family
);
#endif
#endif
memset
(
&
p_ass
->
fmt
,
0
,
sizeof
(
p_ass
->
fmt
)
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment