You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
24 lines
592 B
24 lines
592 B
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
|
|
|