summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/SurfaceMediaSource.cpp
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2012-08-24 10:37:39 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-08-24 10:37:39 -0700
commitff3f75c3e827c1c1f3e3a11b1de46b19444af197 (patch)
tree5b660851627c1926b96278f9dac189b36b17e3cf /media/libstagefright/SurfaceMediaSource.cpp
parent6de95261c619d53f3e7b431fd17995e73928571e (diff)
parentdbcb4c17f16230dfc6af908f176681c49f61b13e (diff)
downloadframeworks_av-ff3f75c3e827c1c1f3e3a11b1de46b19444af197.zip
frameworks_av-ff3f75c3e827c1c1f3e3a11b1de46b19444af197.tar.gz
frameworks_av-ff3f75c3e827c1c1f3e3a11b1de46b19444af197.tar.bz2
Merge "Allow directly setting a DataSource for NuMediaExtractor" into jb-mr1-dev
Diffstat (limited to 'media/libstagefright/SurfaceMediaSource.cpp')
0 files changed, 0 insertions, 0 deletions