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

* commit 'faf0e89ce3bdb2c50eb5da671bc4fc2a618ebf89':
  Make release() behaves the same way as other part of media framework
This commit is contained in:
ztenghui
2013-03-15 18:44:22 +00:00
committed by Android Git Automerger

View File

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