| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-16 12:15:16 (GMT) |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-16 12:15:16 (GMT) |
| commit | 8227d36bd3569efe0f1a4e3ad877e516497666a4 (patch) | |
| tree | 01ee1701eddc6a3033ef45b64fa64c6a52636d50 | |
| parent | 83962004f7275a4ea98ca02398ae5dfff59e5fb7 (diff) | |
| parent | 07b3790d36266358e3bda19cec3b843e5129a986 (diff) | |
| download | ffmpeg-8227d36bd3569efe0f1a4e3ad877e516497666a4.zip ffmpeg-8227d36bd3569efe0f1a4e3ad877e516497666a4.tar.gz ffmpeg-8227d36bd3569efe0f1a4e3ad877e516497666a4.tar.bz2 | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: simplify linking tools with cmdutils.o
tiny_psnr: fix range calculation for sample size of 32 bits
Conflicts:
Makefile
tests/tiny_psnr.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -91,8 +91,8 @@ endef $(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D)))) define DOPROG -OBJS-$(1) += $(1).o -$(1)$(PROGSSUF)_g$(EXESUF): $(OBJS-$(1)) +OBJS-$(1) += $(1).o cmdutils.o +$(1)$(PROGSSUF)_g$(EXESUF): $$(OBJS-$(1)) $$(OBJS-$(1)): CFLAGS += $(CFLAGS-$(1)) $(1)$(PROGSSUF)_g$(EXESUF): LDFLAGS += $(LDFLAGS-$(1)) $(1)$(PROGSSUF)_g$(EXESUF): FF_EXTRALIBS += $(LIBS-$(1)) @@ -101,8 +101,8 @@ endef $(foreach P,$(PROGS-yes),$(eval $(call DOPROG,$(P)))) -%$(PROGSSUF)_g$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS) - $(LD) $(LDFLAGS) $(LD_O) $(OBJS-$*) cmdutils.o $(FF_EXTRALIBS) +%$(PROGSSUF)_g$(EXESUF): %.o $(FF_DEP_LIBS) + $(LD) $(LDFLAGS) $(LD_O) $(OBJS-$*) $(FF_EXTRALIBS) OBJDIRS += tools |