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 8c7932ae30859bc53aa398eccbbeb179c5f3c115..99b0d4737024aa116045a9f1c0411992f73679de 100644 (file)
--- 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 a55f5dbeb58d418119811e3ad23a4f25ddea7c93..ab080a064b0bf4308871ad6f1d58e0898674c929 100644 (file)
--- 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 <paulo@voicetechnology.com.br>.
 Portions created by the Initial Developer are Copyright (C)
 the Initial Developer. All Rights Reserved.
 
+Contributors:
 
+       Seven Du <dujinfang@gmail.com>
 */
 
 #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 e2da30733fd7ee457eb33ffa2890855a7228af2b..6b41fd5dedf65b53e0c7b42758776b5e69a0582b 100644 (file)
--- 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 <paulo@voicetechnology.com.br>.
 Portions created by the Initial Developer are Copyright (C)
 the Initial Developer. All Rights Reserved.
 
+Contributor(s):
+
+       Seven Du <dujinfang@gmail.com>
+
 */
 
 #ifndef MP4_HELPER_HPP_
 #define MP4_HELPER_HPP_
 
-#include <mp4.h>
+#include <mp4v2/mp4v2.h>
 #include <string>
 #include <exception>
 #include <string>
 
+typedef unsigned int u_int;
+
 namespace MP4
 {
        class Exception: public std::exception {