drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make release() behaves the same way as other part of media framework" into jb-mr2-dev

Browse Source
This commit is contained in:
ztenghui
2013-03-15 18:41:33 +00:00
committed by Android (Google) Code Review
parent c60967fd83 a83df76859
commit faf0e89ce3
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/java/android/media/MediaMuxer.java
View File

@ -276,7 +276,7 @@ final public class MediaMuxer {
*/ */
public void release() { public void release() {
if (mState == MUXER_STATE_STARTED) { if (mState == MUXER_STATE_STARTED) {
throw new IllegalStateException("Can't release when muxer is started"); stop();
} }
if (mNativeObject != 0) { if (mNativeObject != 0) {
nativeRelease(mNativeObject); nativeRelease(mNativeObject);