diff options
| author | Andreas Huber <andih@google.com> | 2010-08-21 09:41:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-21 09:41:54 -0700 |
| commit | 9b92412737095ab6a06f01a0c6daaebb79dffb55 (patch) | |
| tree | fc213e4cbbbbf6266afab922d790086e845c47a6 /media/libstagefright/Android.mk | |
| parent | 1b1c377e97558076ee1d427fdd8800ebce1ff300 (diff) | |
| parent | 94249cb1f914c96c3d045d7ec7c2500442f5cc5f (diff) | |
| download | frameworks_av-9b92412737095ab6a06f01a0c6daaebb79dffb55.zip frameworks_av-9b92412737095ab6a06f01a0c6daaebb79dffb55.tar.gz frameworks_av-9b92412737095ab6a06f01a0c6daaebb79dffb55.tar.bz2 | |
am b29ebd39: am f0ad5484: Merge "In the absence of width/height information in the sdp, extract the dimensions from the avc codec specific data." into gingerbread
Merge commit 'b29ebd397e25a7176bcc1c81980f17b0190ebe7f'
* commit 'b29ebd397e25a7176bcc1c81980f17b0190ebe7f':
In the absence of width/height information in the sdp, extract the dimensions from the avc codec specific data.
Diffstat (limited to 'media/libstagefright/Android.mk')
| -rw-r--r-- | media/libstagefright/Android.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index 404762f..b5a6327 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -40,6 +40,7 @@ LOCAL_SRC_FILES:= \ TimedEventQueue.cpp \ Utils.cpp \ WAVExtractor.cpp \ + avc_utils.cpp \ string.cpp LOCAL_C_INCLUDES:= \ |