Changeset affff083025faca5a5366a4c84f1500213953db7

Show
Ignore:
Timestamp:
02/10/08 12:04:14 (5 months ago)
Author:
Jean-Baptiste Kempf <jb@videolan.org>
git-committer:
Jean-Baptiste Kempf <jb@videolan.org> 1202641454 +0000
git-parent:

[6eb31e1ae810d9be2c70a0eb265117806c9db882]

git-author:
Jean-Baptiste Kempf <jb@videolan.org> 1202641454 +0000
Message:

Fix asa subtitles merge. Close #1468
Patch by aballier.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • configure.ac

    raff2054 raffff08  
    38413841AC_ARG_ENABLE(asademux, 
    38423842  [  --enable-asademux      asa subtitle demuxing (default disabled)]) 
    3843 AS_IF( [test "${enable_asa}" != "no"], [ 
     3843AS_IF( [test "${enable_asademux}" != "no"], [ 
    38443844  PKG_CHECK_MODULES(PCRE, 
    38453845      libpcre >= 6.5, 

  • modules/demux/Modules.am

    r53783dc raffff08  
    1919SOURCES_mjpeg = mjpeg.c 
    2020SOURCES_subtitle = subtitle.c 
    21 SOURCES_asademux = subtitle_asa.c asademux.c 
     21SOURCES_asademux = subtitle_asa.c asademux.c asademux_defs.h asademux.h 
    2222SOURCES_ty = ty.c ../codec/cc.h 
    2323SOURCES_vobsub = vobsub.c