diff options
| author | Andreas Huber <andih@google.com> | 2010-07-21 10:41:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-21 10:41:45 -0700 |
| commit | d3bc2528fca033f3d34969a095beec0bc3f79ffd (patch) | |
| tree | 8af023451b660563c83b4e3f5d9da281e1eb7fa3 /media/libstagefright/CameraSource.cpp | |
| parent | 71ff94cb52874e42dede3c6bc4b86757b72cf0b1 (diff) | |
| parent | 4f2074980eefeabe2a37ea5d6dc5904a87107fc4 (diff) | |
| download | frameworks_av-d3bc2528fca033f3d34969a095beec0bc3f79ffd.zip frameworks_av-d3bc2528fca033f3d34969a095beec0bc3f79ffd.tar.gz frameworks_av-d3bc2528fca033f3d34969a095beec0bc3f79ffd.tar.bz2 | |
am 8a9a931f: am 8138e841: Merge "Support finer seek control on MediaSources." into gingerbread
Merge commit '8a9a931fff2d184f7cf77fdd8a425f682f006cfd'
* commit '8a9a931fff2d184f7cf77fdd8a425f682f006cfd':
Support finer seek control on MediaSources.
Diffstat (limited to 'media/libstagefright/CameraSource.cpp')
| -rw-r--r-- | media/libstagefright/CameraSource.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libstagefright/CameraSource.cpp b/media/libstagefright/CameraSource.cpp index aa0893c..f4d269f 100644 --- a/media/libstagefright/CameraSource.cpp +++ b/media/libstagefright/CameraSource.cpp @@ -282,7 +282,8 @@ status_t CameraSource::read( *buffer = NULL; int64_t seekTimeUs; - if (options && options->getSeekTo(&seekTimeUs)) { + ReadOptions::SeekMode mode; + if (options && options->getSeekTo(&seekTimeUs, &mode)) { return ERROR_UNSUPPORTED; } |