diff options
| author | James Dong <jdong@google.com> | 2012-12-28 09:47:37 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-12-28 09:47:37 -0800 |
| commit | 4f6c4590f2064c289b33b2b3978a17f57f75590d (patch) | |
| tree | 1932a3d2ebb0425576a857bd6379f94c6d0af02f /libvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp | |
| parent | 41aa725aa6c03b4ed814d0e2fcd30c7b6d2ad429 (diff) | |
| parent | 7f73aa0a0a043764b3ed387765ae794aecae9ab8 (diff) | |
| download | frameworks_av-4f6c4590f2064c289b33b2b3978a17f57f75590d.zip frameworks_av-4f6c4590f2064c289b33b2b3978a17f57f75590d.tar.gz frameworks_av-4f6c4590f2064c289b33b2b3978a17f57f75590d.tar.bz2 | |
am 3e55b3e4: am 12834fe2: Merge "libvideoeditor: fix code bugs when enabling all-level debugging macros"
* commit '3e55b3e4cdebd47a2e5b5df99107954fb4b1ab64':
libvideoeditor: fix code bugs when enabling all-level debugging macros
Diffstat (limited to 'libvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp')
| -rwxr-xr-x | libvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp b/libvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp index f735c0b..3c8915a 100755 --- a/libvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp +++ b/libvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp @@ -975,7 +975,7 @@ M4OSA_ERR VideoEditor3gpReader_getNextAu(M4OSA_Context context, status_t error; int32_t i32Tmp = 0; - M4OSA_DEBUG_IF1((pReaderContext == 0), M4ERR_PARAMETER, + M4OSA_DEBUG_IF1(( pC== 0), M4ERR_PARAMETER, "VideoEditor3gpReader_getNextAu: invalid context"); M4OSA_DEBUG_IF1((pStreamHandler == 0), M4ERR_PARAMETER, "VideoEditor3gpReader_getNextAu: invalid pointer to M4_StreamHandler"); |