Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>pull/4/head
parent
766688b517
commit
3ae5e8503b
@ -0,0 +1,23 @@
|
||||
Fixed FTBFS caused by c++11.
|
||||
--- a/src/mp4.cpp
|
||||
+++ b/src/mp4.cpp
|
||||
@@ -870,7 +870,7 @@
|
||||
}
|
||||
|
||||
catch (...) {
|
||||
- return MP4_INVALID_TRACK_ID;
|
||||
+ return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
--- a/src/mp4util.h
|
||||
+++ b/src/mp4util.h
|
||||
@@ -33,7 +33,7 @@
|
||||
#ifndef ASSERT
|
||||
# define ASSERT(expr) \
|
||||
if (!(expr)) { \
|
||||
- throw new Exception("assert failure: "LIBMPV42_STRINGIFY((expr)), __FILE__, __LINE__, __FUNCTION__ ); \
|
||||
+ throw new Exception("assert failure: " LIBMPV42_STRINGIFY((expr)), __FILE__, __LINE__, __FUNCTION__ ); \
|
||||
}
|
||||
#endif
|
||||
|
Loading…
Reference in new issue