Changeset 53783dcec6138b919443726524d4eb061f4f0fa1
- Timestamp:
- 02/04/08 23:58:54
(5 months ago)
- Author:
- Sigmund Augdal Helberg <sigmunau@videolan.org>
- git-committer:
- Sigmund Augdal Helberg <sigmunau@videolan.org> 1202165934 +0000
- git-parent:
[7371aa244921787b16af3866dbbe6859b95aaf24]
- git-author:
- Sigmund Augdal Helberg <sigmunau@videolan.org> 1202165934 +0000
- Message:
added the asa subtitle demux from equinox. the file asademux_defs.h is
generated by running ./preparse imports in asa/lib/import so should
probably not be in source tree, but I don't think asa
generates/installs this file by default yet.
Added build changes for csri module and subtitle_asa.
This is the last remaining changes of equinoxes Summer of Code project
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| r09ec56b |
r53783dc |
|
| 3817 | 3817 | AS_IF( [test "${enable_telx}" = "yes"],[ |
|---|
| 3818 | 3818 | VLC_ADD_PLUGINS([telx]) |
|---|
| | 3819 | ]) |
|---|
| | 3820 | |
|---|
| | 3821 | dnl |
|---|
| | 3822 | dnl asa/csri subtitle rendering module |
|---|
| | 3823 | dnl |
|---|
| | 3824 | AC_ARG_ENABLE(csri, |
|---|
| | 3825 | [ --enable-csri Subtitle support using CSRI / asa (default disabled)]) |
|---|
| | 3826 | AS_IF( [test "${enable_csri}" != "no"], [ |
|---|
| | 3827 | PKG_CHECK_MODULES(CSRI, |
|---|
| | 3828 | csri >= 0.1.0, |
|---|
| | 3829 | [ |
|---|
| | 3830 | VLC_ADD_LDFLAGS([csri],[$CSRI_LIBS]) |
|---|
| | 3831 | VLC_ADD_CFLAGS([csri],[$CSRI_CFLAGS]) |
|---|
| | 3832 | VLC_ADD_PLUGINS([csri]) |
|---|
| | 3833 | ],[ |
|---|
| | 3834 | AC_MSG_WARN([CSRI helper library not found]) |
|---|
| | 3835 | ]) |
|---|
| | 3836 | ]) |
|---|
| | 3837 | |
|---|
| | 3838 | dnl |
|---|
| | 3839 | dnl asa demuxer |
|---|
| | 3840 | dnl |
|---|
| | 3841 | AC_ARG_ENABLE(asademux, |
|---|
| | 3842 | [ --enable-asademux asa subtitle demuxing (default disabled)]) |
|---|
| | 3843 | AS_IF( [test "${enable_asa}" != "no"], [ |
|---|
| | 3844 | PKG_CHECK_MODULES(PCRE, |
|---|
| | 3845 | libpcre >= 6.5, |
|---|
| | 3846 | [ |
|---|
| | 3847 | VLC_ADD_LDFLAGS([asademux],[$PCRE_LIBS]) |
|---|
| | 3848 | VLC_ADD_CFLAGS([asademux],[$PCRE_CFLAGS]) |
|---|
| | 3849 | VLC_ADD_PLUGINS([asademux]) |
|---|
| | 3850 | ],[ |
|---|
| | 3851 | AC_MSG_WARN([PCRE library not found (required for asademux)]) |
|---|
| | 3852 | ]) |
|---|
| 3819 | 3853 | ]) |
|---|
| 3820 | 3854 | |
|---|
| rf0e55f5 |
r53783dc |
|
| 19 | 19 | SOURCES_mjpeg = mjpeg.c |
|---|
| 20 | 20 | SOURCES_subtitle = subtitle.c |
|---|
| | 21 | SOURCES_asademux = subtitle_asa.c asademux.c |
|---|
| 21 | 22 | SOURCES_ty = ty.c ../codec/cc.h |
|---|
| 22 | 23 | SOURCES_vobsub = vobsub.c |
|---|
