diff options
| author | James Dong <jdong@google.com> | 2011-06-27 09:49:12 -0700 |
|---|---|---|
| committer | James Dong <jdong@google.com> | 2011-06-27 10:47:23 -0700 |
| commit | efc2e4255b8565f5ad6ef8d1cf0e2695e74190d4 (patch) | |
| tree | 2eaa6c7f600314eb5d8e745a4d3d4750d6864f78 /libvideoeditor/vss | |
| parent | b5c7784c96a606890eb8a8b560153ef4a5d1a0d9 (diff) | |
| download | frameworks_av-efc2e4255b8565f5ad6ef8d1cf0e2695e74190d4.zip frameworks_av-efc2e4255b8565f5ad6ef8d1cf0e2695e74190d4.tar.gz frameworks_av-efc2e4255b8565f5ad6ef8d1cf0e2695e74190d4.tar.bz2 | |
Fix copy and paste errors for mime type strings in the 3GP reader
Change-Id: Ia91b06f4dba9e4265260b28aabeeffeceff6d157
Diffstat (limited to 'libvideoeditor/vss')
| -rwxr-xr-x | libvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp b/libvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp index fd119b1..b91c2ee 100755 --- a/libvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp +++ b/libvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp @@ -1601,7 +1601,7 @@ M4OSA_ERR VideoEditor3gpReader_getNextStreamHandler(M4OSA_Context context, (*pStreamHandler)->m_ESDSInfoSize = size; (*pStreamHandler)->m_pESDSInfo = (M4OSA_UInt8*)\ M4OSA_32bitAlignedMalloc((*pStreamHandler)->m_ESDSInfoSize, - M4READER_3GP, (M4OSA_Char*)"H263 DecoderSpecific" ); + M4READER_3GP, (M4OSA_Char*)"M4V DecoderSpecific" ); if (M4OSA_NULL == (*pStreamHandler)->m_pESDSInfo) { return M4ERR_ALLOC; } @@ -1719,7 +1719,7 @@ M4OSA_ERR VideoEditor3gpReader_getNextStreamHandler(M4OSA_Context context, if ((*pStreamHandler)->m_decoderSpecificInfoSize != 0) { DecoderSpecific = (M4OSA_UInt8*)M4OSA_32bitAlignedMalloc( (*pStreamHandler)->m_decoderSpecificInfoSize, - M4READER_3GP, (M4OSA_Char*)"H263 DecoderSpecific" ); + M4READER_3GP, (M4OSA_Char*)"AMR DecoderSpecific" ); if (M4OSA_NULL == DecoderSpecific) { return M4ERR_ALLOC; } @@ -1737,7 +1737,7 @@ M4OSA_ERR VideoEditor3gpReader_getNextStreamHandler(M4OSA_Context context, (*pStreamHandler)->m_decoderSpecificInfoSize = 9; DecoderSpecific = (M4OSA_UInt8*)M4OSA_32bitAlignedMalloc( (*pStreamHandler)->m_decoderSpecificInfoSize, - M4READER_3GP, (M4OSA_Char*)"H263 DecoderSpecific" ); + M4READER_3GP, (M4OSA_Char*)"PHLP DecoderSpecific" ); if (M4OSA_NULL == DecoderSpecific) { return M4ERR_ALLOC; } @@ -1761,7 +1761,7 @@ M4OSA_ERR VideoEditor3gpReader_getNextStreamHandler(M4OSA_Context context, (*pStreamHandler)->m_ESDSInfoSize = size; (*pStreamHandler)->m_pESDSInfo = (M4OSA_UInt8*)M4OSA_32bitAlignedMalloc( (*pStreamHandler)->m_ESDSInfoSize, M4READER_3GP, - (M4OSA_Char*)"H263 DecoderSpecific" ); + (M4OSA_Char*)"AAC DecoderSpecific" ); if (M4OSA_NULL == (*pStreamHandler)->m_pESDSInfo) { return M4ERR_ALLOC; } @@ -1778,7 +1778,7 @@ M4OSA_ERR VideoEditor3gpReader_getNextStreamHandler(M4OSA_Context context, if ((*pStreamHandler)->m_decoderSpecificInfoSize != 0) { DecoderSpecific = (M4OSA_UInt8*)M4OSA_32bitAlignedMalloc( (*pStreamHandler)->m_decoderSpecificInfoSize, - M4READER_3GP, (M4OSA_Char*)"H263 DecoderSpecific" ); + M4READER_3GP, (M4OSA_Char*)"AAC DecoderSpecific" ); if (M4OSA_NULL == DecoderSpecific) { return M4ERR_ALLOC; } |