summaryrefslogtreecommitdiffstats
path: root/media/jni
diff options
context:
space:
mode:
authorDheeraj Sharma <dheerajs@google.com>2011-01-23 11:55:47 -0800
committerDheeraj Sharma <dheerajs@google.com>2011-01-23 11:55:47 -0800
commitb21827d1bc543e6c3fe31f0b0bc02e8ce306f43f (patch)
tree591d1b2c2557ecc2b057ed24e714888b5c76394c /media/jni
parent4cf6e2f34994f160e1baba205a43c12784dd3e0d (diff)
downloadframeworks_base-b21827d1bc543e6c3fe31f0b0bc02e8ce306f43f.zip
frameworks_base-b21827d1bc543e6c3fe31f0b0bc02e8ce306f43f.tar.gz
frameworks_base-b21827d1bc543e6c3fe31f0b0bc02e8ce306f43f.tar.bz2
Video Editor:Fix for 3375632
Change-Id: I354b8b653ea0ccddda49a6e530ad63b5bd44a5b2
Diffstat (limited to 'media/jni')
-rwxr-xr-xmedia/jni/mediaeditor/VideoBrowserMain.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/jni/mediaeditor/VideoBrowserMain.c b/media/jni/mediaeditor/VideoBrowserMain.c
index 0d40f56..f54a16e 100755
--- a/media/jni/mediaeditor/VideoBrowserMain.c
+++ b/media/jni/mediaeditor/VideoBrowserMain.c
@@ -522,7 +522,7 @@ M4OSA_ERR videoBrowserPrepareFrame(M4OSA_Context pContext, M4OSA_UInt32* pTime)
if (M4WAR_VIDEORENDERER_NO_NEW_FRAME == err)
{
- err = M4NO_ERROR;
+ return err;
}
CHECK_ERR(videoBrowserPrepareFrame, err) ;