diff options
| author | James Dong <jdong@google.com> | 2012-11-02 10:15:33 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-11-02 10:15:34 -0700 |
| commit | bf227b35dfd635d066f78818462da453fa15666d (patch) | |
| tree | 86bcdd8e1b0338a798a022534a9bb65b55f38292 | |
| parent | 73f954e8c735ece75411a81f1967c1839e466c6f (diff) | |
| parent | 11ed78642e2caad1c8c6a524ce4589dfbdfbf824 (diff) | |
| download | frameworks_av-bf227b35dfd635d066f78818462da453fa15666d.zip frameworks_av-bf227b35dfd635d066f78818462da453fa15666d.tar.gz frameworks_av-bf227b35dfd635d066f78818462da453fa15666d.tar.bz2 | |
Merge "Remove unused default parameter for copyBuffer()"
| -rw-r--r-- | media/libstagefright/include/FragmentedMP4Parser.h | 2 | ||||
| -rw-r--r-- | media/libstagefright/mp4/FragmentedMP4Parser.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/media/libstagefright/include/FragmentedMP4Parser.h b/media/libstagefright/include/FragmentedMP4Parser.h index 0edafb9..dbe02b8 100644 --- a/media/libstagefright/include/FragmentedMP4Parser.h +++ b/media/libstagefright/include/FragmentedMP4Parser.h @@ -263,7 +263,7 @@ private: void copyBuffer( sp<ABuffer> *dst, - size_t offset, uint64_t size, size_t extra = 0) const; + size_t offset, uint64_t size) const; DISALLOW_EVIL_CONSTRUCTORS(FragmentedMP4Parser); }; diff --git a/media/libstagefright/mp4/FragmentedMP4Parser.cpp b/media/libstagefright/mp4/FragmentedMP4Parser.cpp index 7fe4e63..54c3d63 100644 --- a/media/libstagefright/mp4/FragmentedMP4Parser.cpp +++ b/media/libstagefright/mp4/FragmentedMP4Parser.cpp @@ -1971,8 +1971,8 @@ status_t FragmentedMP4Parser::parseTrackFragmentRun( } void FragmentedMP4Parser::copyBuffer( - sp<ABuffer> *dst, size_t offset, uint64_t size, size_t extra) const { - sp<ABuffer> buf = new ABuffer(size + extra); + sp<ABuffer> *dst, size_t offset, uint64_t size) const { + sp<ABuffer> buf = new ABuffer(size); memcpy(buf->data(), mBuffer->data() + offset, size); *dst = buf; |