From f675ed916611299ab5cb31d4962e0048cde3973c Mon Sep 17 00:00:00 2001 From: Ilari Liusvaara Date: Thu, 23 Sep 2010 19:53:37 +0300 Subject: [PATCH] Fix some bugs in dump converter - Really make HQX optional (makefile was busted) - Fix fractional framerates. --- streamtools/Makefile | 4 ++-- streamtools/dumpconvert.cpp | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/streamtools/Makefile b/streamtools/Makefile index 8508dc2..e125797 100644 --- a/streamtools/Makefile +++ b/streamtools/Makefile @@ -6,10 +6,10 @@ RESIZE_DRIVERS=resize.o resizer-lanczos.o resizer-nearest.o resizer-test.o I420_DRIVER_FILES=output-drv-rawi420.o rgbtorgb.o X264_DRIVER_FILES=output-drv-x264.o rgbtorgb.o OUTPUT_DRIVERS=$(RESIZE_DRIVERS) dedup.o output-drv.o output-drv-rawrgbx.o output-drv-timecodev2.o output-drv-rawaudio.o output-drv-wav.o output-drv-faac.o $(I420_DRIVER_FILES) $(X264_DRIVER_FILES) output-drv-oggenc.o -#if WITH_HQX +ifdef WITH_HQX RESIZE_DRIVERS += resizer-hqx.o LIBS=-lhqx -#end +endif picturestodump.exe: picturestodump.o newpacket.o png-out.o timecounter.o g++ $(CXXFLAGS2) -o $@ $^ -lz `sdl-config --libs` -lSDL_image $(LIBS) diff --git a/streamtools/dumpconvert.cpp b/streamtools/dumpconvert.cpp index 91b85a0..f5ab9db 100644 --- a/streamtools/dumpconvert.cpp +++ b/streamtools/dumpconvert.cpp @@ -94,6 +94,7 @@ int main(int argc, char** argv) return 1; } if(*x) { + x++; _rate_denum = strtoul(x, &x, 10); if(*x || !_rate_denum) { std::cerr << "--video-framerate: Bad value (d)" << std::endl; -- 2.11.4.GIT