diff --git a/server/Makefile b/server/Makefile index 7b582d56..3b2f6c0a 100644 --- a/server/Makefile +++ b/server/Makefile @@ -1,7 +1,7 @@ VERSION = 0.01 CC = /usr/bin/g++ CFLAGS = -std=gnu++0x -Wall -Wno-unused-function -D_REENTRANT -DVERSION=\"$(VERSION)\" -I.. -LDFLAGS = -lrt -lpthread -lboost_system -lboost_program_options -lvorbis -lvorbisenc -logg -lFLAC +LDFLAGS = -lrt -lpthread -lboost_system -lboost_program_options -lvorbis -lvorbisenc -logg OBJ = snapServer.o controlServer.o pcmEncoder.o oggEncoder.o serverSession.o ../common/log.o ../message/pcmChunk.o ../message/sampleFormat.o BIN = snapserver diff --git a/server/oggEncoder.cpp b/server/oggEncoder.cpp index c0a4dc48..6eefaa99 100644 --- a/server/oggEncoder.cpp +++ b/server/oggEncoder.cpp @@ -6,7 +6,7 @@ using namespace std; -OggEncoder::OggEncoder(const msg::SampleFormat& format) : Encoder(format) +OggEncoder::OggEncoder(const msg::SampleFormat& format) : Encoder(format), eos(0) { init(); lastGranulepos = -1; diff --git a/server/oggEncoder.h b/server/oggEncoder.h index 91e9e483..86cc26ad 100644 --- a/server/oggEncoder.h +++ b/server/oggEncoder.h @@ -31,7 +31,7 @@ private: ogg_int64_t lastGranulepos; - int eos=0,ret; + int eos, ret; int i, founddata; int32_t tv_sec;