Ticket #102: disable.2.patch

File disable.2.patch, 4.9 KB (added by reimar, 15 years ago)

with additional fix for --disable-liba52 compile

  • configure

    RCS file: /cvsroot/mplayer/main/configure,v
    retrieving revision 1.916
    diff -u -r1.916 configure
     
    62946294
    62956295OPENDIVX = $_opendivx
    62966296
     6297MP3LIB = $_mp3lib
     6298LIBA52 = $_liba52
     6299LIBMPEG2 = $_libmpeg2
     6300
    62976301UNRARLIB = $_unrarlib
    62986302HAVE_FFPOSTPROCESS = $_def_haveffpostprocess
    62996303PNG = $_mkf_png
  • Makefile

    RCS file: /cvsroot/mplayer/main/Makefile,v
    retrieving revision 1.303
    diff -u -r1.303 Makefile
     
    3333VO_LIBS = $(AA_LIB) $(X_LIB) $(SDL_LIB) $(GGI_LIB) $(MP1E_LIB) $(MLIB_LIB) $(SVGA_LIB) $(DIRECTFB_LIB) $(CACA_LIB)
    3434AO_LIBS = $(ARTS_LIB) $(ESD_LIB) $(JACK_LIB) $(NAS_LIB) $(SGIAUDIO_LIB)
    3535CODEC_LIBS = $(AV_LIB) $(FAME_LIB) $(MAD_LIB) $(VORBIS_LIB) $(THEORA_LIB) $(FAAD_LIB) $(LIBLZO_LIB) $(DECORE_LIB) $(XVID_LIB) $(DTS_LIB) $(PNG_LIB) $(Z_LIB) $(JPEG_LIB) $(ALSA_LIB) $(XMMS_LIB) $(X264_LIB)
    36 COMMON_LIBS = libmpcodecs/libmpcodecs.a mp3lib/libMP3.a liba52/liba52.a libmpeg2/libmpeg2.a $(W32_LIB) $(DS_LIB) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a postproc/libswscale.a osdep/libosdep.a $(DVDREAD_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(MPLAYER_NETWORK_LIB) $(WIN32_LIB) $(GIF_LIB) $(MACOSX_FRAMEWORKS) $(SMBSUPPORT_LIB) $(FRIBIDI_LIB) $(FONTCONFIG_LIB) $(ENCA_LIB)
     36COMMON_LIBS = libmpcodecs/libmpcodecs.a $(W32_LIB) $(DS_LIB) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a postproc/libswscale.a osdep/libosdep.a $(DVDREAD_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(MPLAYER_NETWORK_LIB) $(WIN32_LIB) $(GIF_LIB) $(MACOSX_FRAMEWORKS) $(SMBSUPPORT_LIB) $(FRIBIDI_LIB) $(FONTCONFIG_LIB) $(ENCA_LIB)
    3737
    3838CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(FREETYPE_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(SDL_INC) $(X11_INC) $(FRIBIDI_INC) $(DVB_INC) $(XVID_INC) $(FONTCONFIG_INC) $(CACA_INC) # -Wall
    3939ifeq ($(TOOLAME),yes)
     
    4141CODEC_LIBS += $(TOOLAME_LIB)
    4242endif
    4343
    44 PARTS = libmpdemux libmpcodecs mp3lib liba52 libmpeg2 libavcodec libavformat libao2 drivers osdep postproc input libvo libaf
     44PARTS = libmpdemux libmpcodecs libavcodec libavformat libao2 drivers osdep postproc input libvo libaf
     45ifeq ($(MP3LIB),yes)
     46PARTS += mp3lib
     47endif
     48ifeq ($(LIBA52),yes)
     49PARTS += liba52
     50endif
     51ifeq ($(LIBMPEG2),yes)
     52PARTS += libmpeg2
     53endif
    4554ifeq ($(INTERNAL_FAAD),yes)
    46 COMMON_LIBS += libfaad2/libfaad2.a
    4755PARTS += libfaad2
    4856endif
    4957ifeq ($(VIDIX),yes)
     
    7482ALL_PRG += $(PRG_MENCODER)
    7583endif
    7684
    77 COMMON_DEPS = $(W32_DEP) $(DS_DEP) $(MP1E_DEP) $(AV_DEP) libmpdemux/libmpdemux.a libmpcodecs/libmpcodecs.a libao2/libao2.a liba52/liba52.a mp3lib/libMP3.a libmpeg2/libmpeg2.a osdep/libosdep.a postproc/libswscale.a input/libinput.a libvo/libvo.a libaf/libaf.a
     85COMMON_DEPS = $(W32_DEP) $(DS_DEP) $(MP1E_DEP) $(AV_DEP) libmpdemux/libmpdemux.a libmpcodecs/libmpcodecs.a libao2/libao2.a osdep/libosdep.a postproc/libswscale.a input/libinput.a libvo/libvo.a libaf/libaf.a
    7886
     87ifeq ($(MP3LIB),yes)
     88COMMON_DEPS += mp3lib/libMP3.a
     89COMMON_LIBS += mp3lib/libMP3.a
     90endif
     91ifeq ($(LIBA52),yes)
     92COMMON_DEPS += liba52/liba52.a
     93COMMON_LIBS += liba52/liba52.a
     94endif
     95ifeq ($(LIBMPEG2),yes)
     96COMMON_DEPS += libmpeg2/libmpeg2.a
     97COMMON_LIBS += libmpeg2/libmpeg2.a
     98endif
    7999ifeq ($(INTERNAL_FAAD),yes)
    80100COMMON_DEPS += libfaad2/libfaad2.a
     101COMMON_LIBS += libfaad2/libfaad2.a
    81102endif
    82103ifeq ($(VIDIX),yes)
    83104COMMON_DEPS += libdha/libdha.so vidix/libvidix.a
  • libmpdemux/demux_ts.c

    RCS file: /cvsroot/mplayer/main/libmpdemux/demux_ts.c,v
    retrieving revision 1.16
    diff -u -r1.16 demux_ts.c
     
    374374} tsdemux_init_t;
    375375
    376376
     377#if USE_LIBA52
    377378//second stage: returns the count of A52 syncwords found
    378379static int a52_check(char *buf, int len)
    379380{
     
    401402        mp_msg(MSGT_DEMUXER, MSGL_V, "A52_CHECK(%d input bytes), found %d frame syncwords of %d bytes length\n", len, ok, frame_length);       
    402403        return ok;
    403404}
     405#endif
    404406
    405407
    406408static off_t ts_detect_streams(demuxer_t *demuxer, tsdemux_init_t *param)
     
    432434                pos = stream_tell(demuxer->stream);
    433435                if(ts_parse(demuxer, &es, tmp, 1))
    434436                {
     437#if USE_LIBA52
    435438                        //Non PES-aligned A52 audio may escape detection if PMT is not present;
    436439                        //in this case we try to find at least 3 A52 syncwords
    437440                        if((es.type == PES_PRIVATE1) && (! audio_found))
     
    449452                                        }
    450453                                }
    451454                        }
     455#endif
    452456                       
    453457                        is_audio = ((es.type == AUDIO_MP2) || (es.type == AUDIO_A52) || (es.type == AUDIO_LPCM_BE) || (es.type == AUDIO_AAC));
    454458                        is_video = ((es.type == VIDEO_MPEG1) || (es.type == VIDEO_MPEG2) || (es.type == VIDEO_MPEG4));