From: Seven Du Date: Sat, 25 May 2013 04:17:07 +0000 (+0800) Subject: update to mp4v2-2.0.0 X-Git-Tag: v1.2.13~222 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dca41d07d696cacb0fe591521e242752f832761a;p=thirdparty%2Ffreeswitch.git update to mp4v2-2.0.0 It seems I cannot contact the original author it seems has a bug which even cannot compile with mp4v2-trunk-479 This patch allow it to compile --- diff --git a/src/mod/applications/mod_mp4/Makefile b/src/mod/applications/mod_mp4/Makefile index 8c7932ae30..99b0d47370 100644 --- a/src/mod/applications/mod_mp4/Makefile +++ b/src/mod/applications/mod_mp4/Makefile @@ -1,3 +1,4 @@ +# LOCAL_CFLAGS=-I./mp4v2-2.0.0/include LOCAL_LDFLAGS=-lmp4v2 LOCAL_SOURCES=mp4_helper.cpp LOCAL_OBJS=mp4_helper.o diff --git a/src/mod/applications/mod_mp4/mp4_helper.cpp b/src/mod/applications/mod_mp4/mp4_helper.cpp index a55f5dbeb5..ab080a064b 100644 --- a/src/mod/applications/mod_mp4/mp4_helper.cpp +++ b/src/mod/applications/mod_mp4/mp4_helper.cpp @@ -17,7 +17,9 @@ Paulo Rogério Panhoto . Portions created by the Initial Developer are Copyright (C) the Initial Developer. All Rights Reserved. +Contributors: + Seven Du */ #include "mp4_helper.hpp" @@ -38,7 +40,7 @@ namespace MP4 void Context::open(const char * file) { - fh = MP4Read(file, 0); + fh = MP4Read(file); if (fh == MP4_INVALID_FILE_HANDLE) throw Exception(file, "Open failed"); getTracks(file); } diff --git a/src/mod/applications/mod_mp4/mp4_helper.hpp b/src/mod/applications/mod_mp4/mp4_helper.hpp index e2da30733f..6b41fd5ded 100644 --- a/src/mod/applications/mod_mp4/mp4_helper.hpp +++ b/src/mod/applications/mod_mp4/mp4_helper.hpp @@ -17,16 +17,22 @@ Paulo Rogério Panhoto . Portions created by the Initial Developer are Copyright (C) the Initial Developer. All Rights Reserved. +Contributor(s): + + Seven Du + */ #ifndef MP4_HELPER_HPP_ #define MP4_HELPER_HPP_ -#include +#include #include #include #include +typedef unsigned int u_int; + namespace MP4 { class Exception: public std::exception {