summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2011-01-21 13:17:42 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-21 13:17:42 -0800
commit42ab78068f67d5b22fbfbcf40448bae505d543ca (patch)
treef4bf970d75b7a8e886e3a06227aaf2b1e906f2db /include
parentffaee8a4c3d99342445c92254c42160512583180 (diff)
parentbc7f5b2e56107cfeaeeab13cf8979379e3c2f139 (diff)
downloadframeworks_av-42ab78068f67d5b22fbfbcf40448bae505d543ca.zip
frameworks_av-42ab78068f67d5b22fbfbcf40448bae505d543ca.tar.gz
frameworks_av-42ab78068f67d5b22fbfbcf40448bae505d543ca.tar.bz2
am 05aa0827: Merge "Some tweaks to HTTP live / nuplayer behaviour" into honeycomb
* commit '05aa082770d812c5921d6b2f9b3559f1fd1536a8': Some tweaks to HTTP live / nuplayer behaviour
Diffstat (limited to 'include')
-rw-r--r--include/media/stagefright/foundation/ADebug.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/media/stagefright/foundation/ADebug.h b/include/media/stagefright/foundation/ADebug.h
index eb5e494..450dcfe 100644
--- a/include/media/stagefright/foundation/ADebug.h
+++ b/include/media/stagefright/foundation/ADebug.h
@@ -75,7 +75,10 @@ MAKE_COMPARATOR(GT,>)
#define CHECK_GE(x,y) CHECK_OP(x,y,GE,>=)
#define CHECK_GT(x,y) CHECK_OP(x,y,GT,>)
-#define TRESPASS() LOG_ALWAYS_FATAL("Should not be here.")
+#define TRESPASS() \
+ LOG_ALWAYS_FATAL( \
+ __FILE__ ":" LITERAL_TO_STRING(__LINE__) \
+ " Should not be here.");
} // namespace android