summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/include
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-10-01 11:21:16 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-01 11:21:16 -0700
commit969247b7ab387743035dece47356678c8aec2ac4 (patch)
tree2268be28b510f091317a8bc54e575dd99337a65d /media/libstagefright/include
parent9ad6e8bd9fab860e639f6ce95479e4b2a9b03ff5 (diff)
parent32d34824b2bad653ec5e9ef767e50f13a8c182d7 (diff)
downloadframeworks_av-969247b7ab387743035dece47356678c8aec2ac4.zip
frameworks_av-969247b7ab387743035dece47356678c8aec2ac4.tar.gz
frameworks_av-969247b7ab387743035dece47356678c8aec2ac4.tar.bz2
am 14401bf7: am d1398db3: Merge "Squashed commit of the following:" into gingerbread
Merge commit '14401bf7bca34c692f248406c78bd8b49783217a' * commit '14401bf7bca34c692f248406c78bd8b49783217a': Squashed commit of the following:
Diffstat (limited to 'media/libstagefright/include')
-rw-r--r--media/libstagefright/include/avc_utils.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/media/libstagefright/include/avc_utils.h b/media/libstagefright/include/avc_utils.h
index cc405b5..6602852 100644
--- a/media/libstagefright/include/avc_utils.h
+++ b/media/libstagefright/include/avc_utils.h
@@ -22,9 +22,13 @@
namespace android {
+struct ABitReader;
+
void FindAVCDimensions(
const sp<ABuffer> &seqParamSet, int32_t *width, int32_t *height);
+unsigned parseUE(ABitReader *br);
+
} // namespace android
#endif // AVC_UTILS_H_