From 05364aad2edc886f8d15e0180518d01cbd4ada4e Mon Sep 17 00:00:00 2001 From: Thulinma Date: Mon, 5 Dec 2011 15:35:10 +0100 Subject: [PATCH] Fix DTSC tools compiling --- tools/DTSC_Analyser/Makefile | 2 +- tools/DTSC_Analyser/main.cpp | 2 +- tools/FLV2DTSC/Makefile | 2 +- tools/FLV2DTSC/main.cpp | 6 +++--- util/flv_tag.cpp | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/DTSC_Analyser/Makefile b/tools/DTSC_Analyser/Makefile index 2d12ca7e..ad834129 100644 --- a/tools/DTSC_Analyser/Makefile +++ b/tools/DTSC_Analyser/Makefile @@ -1,4 +1,4 @@ -SRC = main.cpp ../util/dtsc.cpp +SRC = main.cpp ../../util/dtsc.cpp OBJ = $(SRC:.cpp=.o) OUT = DTSC_Info INCLUDES = diff --git a/tools/DTSC_Analyser/main.cpp b/tools/DTSC_Analyser/main.cpp index 81176bac..e9c5463d 100644 --- a/tools/DTSC_Analyser/main.cpp +++ b/tools/DTSC_Analyser/main.cpp @@ -10,7 +10,7 @@ #include #include #include -#include "../util/dtsc.h" //DTSC support +#include "../../util/dtsc.h" //DTSC support /// Reads DTSC from stdin and outputs human-readable information to stderr. int main() { diff --git a/tools/FLV2DTSC/Makefile b/tools/FLV2DTSC/Makefile index 8787c723..6598d44a 100644 --- a/tools/FLV2DTSC/Makefile +++ b/tools/FLV2DTSC/Makefile @@ -1,4 +1,4 @@ -SRC = main.cpp ../util/flv_tag.cpp ../util/dtsc.cpp ../util/amf.cpp ../util/socket.cpp +SRC = main.cpp ../../util/flv_tag.cpp ../../util/dtsc.cpp ../../util/amf.cpp ../../util/socket.cpp OBJ = $(SRC:.cpp=.o) OUT = DDV_FLV2DTSC INCLUDES = diff --git a/tools/FLV2DTSC/main.cpp b/tools/FLV2DTSC/main.cpp index 5b17f381..3655432e 100644 --- a/tools/FLV2DTSC/main.cpp +++ b/tools/FLV2DTSC/main.cpp @@ -10,9 +10,9 @@ #include #include #include -#include "../util/flv_tag.h" //FLV support -#include "../util/dtsc.h" //DTSC support -#include "../util/amf.h" //AMF support +#include "../../util/flv_tag.h" //FLV support +#include "../../util/dtsc.h" //DTSC support +#include "../../util/amf.h" //AMF support // String onMetaData // ECMA Array diff --git a/util/flv_tag.cpp b/util/flv_tag.cpp index f0fb956f..c5b4b964 100644 --- a/util/flv_tag.cpp +++ b/util/flv_tag.cpp @@ -336,7 +336,7 @@ bool FLV::Tag::DTSCLoader(DTSC::Stream & S){ /// Helper function that properly sets the tag length from the internal len variable. void FLV::Tag::setLen(){ int len4 = len - 4; - int i = data+len-1; + int i = len-1; data[--i] = (len4) & 0xFF; len4 >>= 8; data[--i] = (len4) & 0xFF;