Fix asa subtitles merge. Close #1468

Patch by aballier.

diff --git a/configure.ac b/configure.ac
index bfc16c082b8171fbe5380f34d6b56cfe09134c43..53d994284cfece292de47d9854c9995abb9f0e8d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3840,7 +3840,7 @@ dnl asa demuxer
 dnl
 AC_ARG_ENABLE(asademux,
   [  --enable-asademux      asa subtitle demuxing (default disabled)])
-AS_IF( [test "${enable_asa}" != "no"], [
+AS_IF( [test "${enable_asademux}" != "no"], [
   PKG_CHECK_MODULES(PCRE,
       libpcre >= 6.5,
       [

diff --git a/modules/demux/Modules.am b/modules/demux/Modules.am
index 2070f109675f256f8b2fb66ec39c3b2a138c7ced..ce7796f8b66da81e6c11a70846dde35d8619ec37 100644 (file)
--- a/modules/demux/Modules.am
+++ b/modules/demux/Modules.am
@@ -18,7 +18,7 @@ SOURCES_pva = pva.c
 SOURCES_aiff = aiff.c
 SOURCES_mjpeg = mjpeg.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_vobsub = vobsub.c
 SOURCES_voc = voc.c