Mercurial > mplayer.hg
view common.mak @ 22616:09dc129234a0
Matroska seeking fixes
If a relative seek forward went past the last index position the
Matroska demuxer did not seek to any index position. It did however set
the mkv_d->skip_to_timecode variable which meant that the next
fill_buffer() call would read from the current position until the target
position (probably the end of the file). Fix this by changing the code
to seek to the last index position if that is between the current and
target positions.
Also change backwards relative seek to accept an exactly matching index
position (<= vs <) and reorganize the seeking conditionals to allow
making the above change without turning the code into a complete mess.
author | uau |
---|---|
date | Fri, 16 Mar 2007 14:55:41 +0000 |
parents | 3465873e5c59 |
children | dd0d8b99192b |
line wrap: on
line source
# # common bits used by all libraries # VPATH = $(SRC_PATH_BARE)/lib$(NAME) SRC_DIR = "$(VPATH)" CFLAGS += $(CFLAGS-yes) OBJS += $(OBJS-yes) ASM_OBJS += $(ASM_OBJS-yes) CFLAGS += -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ -D_ISOC9X_SOURCE -I$(BUILD_ROOT) -I$(SRC_PATH) \ -I$(SRC_PATH)/libavutil $(OPTFLAGS) SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S) $(CPPOBJS:.o=.cpp) OBJS := $(OBJS) $(ASM_OBJS) $(CPPOBJS) STATIC_OBJS := $(OBJS) $(STATIC_OBJS) SHARED_OBJS := $(OBJS) $(SHARED_OBJS) all: $(EXTRADEPS) $(LIB) $(SLIBNAME) $(LIB): $(STATIC_OBJS) rm -f $@ $(AR) rc $@ $^ $(EXTRAOBJS) $(RANLIB) $@ $(SLIBNAME): $(SLIBNAME_WITH_MAJOR) ln -sf $^ $@ $(SLIBNAME_WITH_MAJOR): $(SHARED_OBJS) $(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS) $(EXTRAOBJS) $(SLIB_EXTRA_CMD) %.o: %.c $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $< %.o: %.S $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $< %: %.o $(LIB) $(CC) $(LDFLAGS) -o $@ $^ $(EXTRALIBS) depend dep: $(SRCS) $(CC) -MM $(CFLAGS) $^ 1>.depend clean:: rm -f *.o *.d *~ *.a *.lib *.so *.so.* *.dylib *.dll \ *.def *.dll.a *.exp distclean: clean rm -f .depend ifeq ($(BUILD_SHARED),yes) INSTLIBTARGETS += install-lib-shared endif ifeq ($(BUILD_STATIC),yes) INSTLIBTARGETS += install-lib-static endif install: install-libs install-headers install-libs: $(INSTLIBTARGETS) install-lib-shared: $(SLIBNAME) install -d "$(shlibdir)" install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \ "$(shlibdir)/$(SLIBNAME_WITH_VERSION)" cd "$(shlibdir)" && \ ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR) cd "$(shlibdir)" && \ ln -sf $(SLIBNAME_WITH_VERSION) $(SLIBNAME) $(SLIB_INSTALL_EXTRA_CMD) install-lib-static: $(LIB) install -d "$(libdir)" install -m 644 $(LIB) "$(libdir)" $(LIB_INSTALL_EXTRA_CMD) install-headers: install -d "$(incdir)" install -d "$(libdir)/pkgconfig" install -m 644 $(addprefix $(SRC_DIR)/,$(HEADERS)) "$(incdir)" install -m 644 $(BUILD_ROOT)/lib$(NAME).pc "$(libdir)/pkgconfig" uninstall: uninstall-libs uninstall-headers uninstall-libs: -rm -f "$(shlibdir)/$(SLIBNAME_WITH_MAJOR)" \ "$(shlibdir)/$(SLIBNAME)" \ "$(shlibdir)/$(SLIBNAME_WITH_VERSION)" -rm -f "$(libdir)/$(LIB)" uninstall-headers: rm -f $(addprefix "$(incdir)/",$(HEADERS)) rm -f "$(libdir)/pkgconfig/lib$(NAME).pc" .PHONY: all depend dep clean distclean install* uninstall* ifneq ($(wildcard .depend),) include .depend endif