summaryrefslogtreecommitdiffstats
path: root/media/libmedia
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-10-13 14:28:52 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-13 14:28:52 -0700
commit0b5181ddfdde400f9cac6db239cf97ced3b67e22 (patch)
treefe886eb741a742dfa054b884b0def6cfec92d887 /media/libmedia
parent217c81ec709f657bc2817b2083e400946b13e9d8 (diff)
parenta82c3c631a9c0bb721e35d03714715ffe3b0b0c3 (diff)
downloadframeworks_av-0b5181ddfdde400f9cac6db239cf97ced3b67e22.zip
frameworks_av-0b5181ddfdde400f9cac6db239cf97ced3b67e22.tar.gz
frameworks_av-0b5181ddfdde400f9cac6db239cf97ced3b67e22.tar.bz2
am 5f423917: Merge "Attempt to derive the avg. bitrate of the entire stream from metadata." into gingerbread
Merge commit '5f42391701c0657d520d00f62a4c061b18ba1280' into gingerbread-plus-aosp * commit '5f42391701c0657d520d00f62a4c061b18ba1280': Attempt to derive the avg. bitrate of the entire stream from metadata.
Diffstat (limited to 'media/libmedia')
0 files changed, 0 insertions, 0 deletions