Skip to content

V
vlc-2-2
Commit affff083 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Fix asa subtitles merge. Close #1468 

Patch by aballier.
parent 6eb31e1a
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
configure.ac
View file @ affff083
...@@ -3840,7 +3840,7 @@ dnl asa demuxer ...@@ -3840,7 +3840,7 @@ dnl asa demuxer
dnl dnl
AC_ARG_ENABLE(asademux, AC_ARG_ENABLE(asademux,
[ --enable-asademux asa subtitle demuxing (default disabled)]) [ --enable-asademux asa subtitle demuxing (default disabled)])
AS_IF( [test "${enable_asa}" != "no"], [ AS_IF( [test "${enable_asademux}" != "no"], [
PKG_CHECK_MODULES(PCRE, PKG_CHECK_MODULES(PCRE,
libpcre >= 6.5, libpcre >= 6.5,
[ [
......
modules/demux/Modules.am
View file @ affff083
...@@ -18,7 +18,7 @@ SOURCES_pva = pva.c ...@@ -18,7 +18,7 @@ SOURCES_pva = pva.c
SOURCES_aiff = aiff.c SOURCES_aiff = aiff.c
SOURCES_mjpeg = mjpeg.c SOURCES_mjpeg = mjpeg.c
SOURCES_subtitle = subtitle.c SOURCES_subtitle = subtitle.c
SOURCES_asademux = subtitle_asa.c asademux.c SOURCES_asademux = subtitle_asa.c asademux.c asademux_defs.h asademux.h
SOURCES_ty = ty.c ../codec/cc.h SOURCES_ty = ty.c ../codec/cc.h
SOURCES_vobsub = vobsub.c SOURCES_vobsub = vobsub.c
SOURCES_voc = voc.c SOURCES_voc = voc.c
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment