diff options
| -rw-r--r-- | Changelog | 2 | ||||
| -rw-r--r-- | Makefile | 7 | ||||
| -rwxr-xr-x | configure | 10 |
3 files changed, 15 insertions, 4 deletions
@@ -35,6 +35,8 @@ MPlayer (1.0) Configure with --enable-protocol="file_protocol pipe_protocol http_protocol rtmp_protocol tcp_protocol udp_protocol" and use e.g. ffmpeg://http://example.com/test + * experimental support for external libass, configure with + --disable-ass-internal MEncoder: * add -tsprog for demuxer lavf @@ -116,16 +116,17 @@ SRCS_COMMON-$(LIBA52_INTERNAL) += liba52/crc.c \ liba52/imdct.c \ liba52/parse.c \ -SRCS_COMMON-$(LIBASS) += libass/ass.c \ +SRCS_COMMON-$(LIBASS) += libmpcodecs/vf_ass.c \ + libass/ass_mp.c \ + +SRCS_COMMON-$(LIBASS_INTERNAL) += libass/ass.c \ libass/ass_bitmap.c \ libass/ass_cache.c \ libass/ass_font.c \ libass/ass_fontconfig.c \ libass/ass_library.c \ - libass/ass_mp.c \ libass/ass_render.c \ libass/ass_utils.c \ - libmpcodecs/vf_ass.c \ SRCS_COMMON-$(LIBAVCODEC) += av_opts.c \ libaf/af_lavcresample.c \ @@ -280,7 +280,8 @@ Optional features: --disable-vstream disable TiVo vstream client support [autodetect] --disable-pthreads disable Posix threads support [autodetect] --disable-w32threads disable Win32 threads support [autodetect] - --disable-ass disable internal SSA/ASS subtitle support [autodetect] + --disable-ass-internal disable internal SSA/ASS subtitle support [autodetect] + --disable-ass disable SSA/ASS subtitle support [autodetect] --enable-rpath enable runtime linker path for extra libs [disabled] Codecs: @@ -741,6 +742,7 @@ _vstream=auto _pthreads=auto _w32threads=auto _ass=auto +ass_internal=yes _rpath=no _asmalign_pot=auto _stream_cache=yes @@ -1248,6 +1250,8 @@ for ac_option do --disable-w32threads) _w32threads=no ;; --enable-ass) _ass=yes ;; --disable-ass) _ass=no ;; + --enable-ass-internal) ass_internal=yes ;; + --disable-ass-internal) ass_internal=no ;; --enable-rpath) _rpath=yes ;; --disable-rpath) _rpath=no ;; @@ -6166,6 +6170,9 @@ EOF cc_check $($_freetypeconfig --cflags) $($_freetypeconfig --libs) && _ass=yes if test "$_ass" = no ; then _res_comment="FreeType >= 2.1.8 needed" + elif test "$ass_internal" = no ; then + _res_comment="external" + extra_ldflags="$extra_ldflags -lass" fi fi if test "$_ass" = yes ; then @@ -8304,6 +8311,7 @@ LADSPA = $_ladspa LIBA52 = $_liba52 LIBA52_INTERNAL = $_liba52_internal LIBASS = $_ass +LIBASS_INTERNAL = $ass_internal LIBBS2B = $_libbs2b LIBDCA = $_libdca LIBDV = $_libdv |