Mercurial > mplayer.hg
view TOOLS/Makefile @ 25509:1cfa39a320cc
Fix update_subtitles() checking subtitle type for the wrong track.
update_subtitles() uses 'type' field from d_dvdsub even when some other track
is active. For this reason, external vobsub is not displayed when there is at
least one text track from demuxer (type is always 't' or 'a' in this case).
The solution is to check vobsub_id and dvdsub_id instead.
author | eugeni |
---|---|
date | Fri, 28 Dec 2007 20:57:38 +0000 |
parents | 3e2fc119e4f4 |
children | 20e00af8f426 |
line wrap: on
line source
include ../config.mak CFLAGS = -I.. OBJS = alaw-gen$(EXESUF) \ asfinfo$(EXESUF) \ avi-fix$(EXESUF) \ avisubdump$(EXESUF) \ dump_mp4$(EXESUF) \ modify_reg$(EXESUF) \ movinfo$(EXESUF) \ subrip$(EXESUF) \ # vivodump$(EXESUF) \ COMMON_LIBS = ../mp_msg.o ../mp_fifo.o ../osdep/libosdep.a -ltermcap -lm all: $(OBJS) subrip$(EXESUF): subrip.c $(CC) $(CFLAGS) -o $@ $< ../vobsub.o ../spudec.o \ ../unrarlib.o ../libswscale/libswscale.a ../libavutil/libavutil.a \ ../libmpcodecs/img_format.o $(COMMON_LIBS) #FIXME: Linking is broken, help welcome. vivodump$(EXESUF): vivodump.c $(CC) $(CFLAGS) -o $@ $< ../libmpdemux/libmpdemux.a \ ../stream/stream.a $(COMMON_LIBS) fastmemcpybench: fastmemcpybench.c $(CC) $(CFLAGS) $< -o fastmem-mmx$(EXESUF) -DNAME=\"mmx\" -DHAVE_MMX $(CC) $(CFLAGS) $< -o fastmem-k6$(EXESUF) -DNAME=\"k6\ \" -DHAVE_MMX -DHAVE_3DNOW $(CC) $(CFLAGS) $< -o fastmem-k7$(EXESUF) -DNAME=\"k7\ \" -DHAVE_MMX -DHAVE_3DNOW -DHAVE_MMX2 $(CC) $(CFLAGS) $< -o fastmem-sse$(EXESUF) -DNAME=\"sse\" -DHAVE_MMX -DHAVE_SSE -DHAVE_MMX2 $(CC) $(CFLAGS) $< -o fastmem2-mmx$(EXESUF) -DNAME=\"mga-mmx\" -DHAVE_MGA -DHAVE_MMX $(CC) $(CFLAGS) $< -o fastmem2-k6$(EXESUF) -DNAME=\"mga-k6\ \" -DHAVE_MGA -DHAVE_MMX -DHAVE_3DNOW $(CC) $(CFLAGS) $< -o fastmem2-k7$(EXESUF) -DNAME=\"mga-k7\ \" -DHAVE_MGA -DHAVE_MMX -DHAVE_3DNOW -DHAVE_MMX2 $(CC) $(CFLAGS) $< -o fastmem2-sse$(EXESUF) -DNAME=\"mga-sse\" -DHAVE_MGA -DHAVE_MMX -DHAVE_SSE -DHAVE_MMX2 bmovl-test$(EXESUF): bmovl-test.c $(CC) $(CFLAGS) -o $@ $< -lSDL_image vfw2menc$(EXESUF): vfw2menc.c $(CC) $< -o $@ -lwinmm -lole32 REAL_SRCS = $(wildcard realcodecs/*.c) REAL_TARGETS = $(REAL_SRCS:.c=.so.6.0) realcodecs: $(REAL_TARGETS) subrip fastmemcpybench realcodecs: CFLAGS += -g %.so.6.0: %.o ld -shared -o $@ $< -ldl -lc # FIXME: netstream linking is a mess that should be fixed properly some day. # It does not work with either GUI, LIVE555, libavformat, cdparanoia enabled. NETSTREAM_DEPS = ../libmpdemux/libmpdemux.a \ ../stream/stream.a \ ../dvdread/libdvdread.a \ ../libdvdcss/libdvdcss.a \ ../libavutil/libavutil.a \ ../m_option.o \ ../m_struct.o \ $(COMMON_LIBS) ifeq ($(TARGET_WIN32),yes) NETSTREAM_DEPS += -lwsock32 endif netstream: netstream.o $(NETSTREAM_DEPS) $(CC) -o $@ $^ clean distclean: rm -f *.o *~ $(OBJS) rm -f fastmem-* fastmem2-* fastmemcpybench netstream rm -f bmovl-test$(EXESUF) vfw2menc$(EXESUF) rm -f $(REAL_TARGETS) .PHONY: all fastmemcpybench realcodecs clean distclean