diff options
author | Wei Jia <wjia@google.com> | 2014-09-23 16:17:45 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-23 16:17:45 +0000 |
commit | d93ebc8aa9433678b36285f8d43dcbc00a8dd534 (patch) | |
tree | 37dd06dff4580c6417f582c5d5f2003876ac4ab8 /media/libstagefright/mpeg2ts | |
parent | 129e03672a58af34f24fea84e085aaed8e7847a5 (diff) | |
parent | 0973af247786ff1be980390cc274364fca6b2d6e (diff) | |
download | frameworks_av-d93ebc8aa9433678b36285f8d43dcbc00a8dd534.zip frameworks_av-d93ebc8aa9433678b36285f8d43dcbc00a8dd534.tar.gz frameworks_av-d93ebc8aa9433678b36285f8d43dcbc00a8dd534.tar.bz2 |
am 0973af24: am 0079b331: Merge "MediaBuffer: ABuffer will release MediaBuffer when it\'s destructed." into lmp-dev
* commit '0973af247786ff1be980390cc274364fca6b2d6e':
MediaBuffer: ABuffer will release MediaBuffer when it's destructed.
Diffstat (limited to 'media/libstagefright/mpeg2ts')
-rw-r--r-- | media/libstagefright/mpeg2ts/AnotherPacketSource.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/media/libstagefright/mpeg2ts/AnotherPacketSource.cpp b/media/libstagefright/mpeg2ts/AnotherPacketSource.cpp index c74c3e7..a03f6f9 100644 --- a/media/libstagefright/mpeg2ts/AnotherPacketSource.cpp +++ b/media/libstagefright/mpeg2ts/AnotherPacketSource.cpp @@ -254,11 +254,6 @@ void AnotherPacketSource::queueDiscontinuity( int32_t oldDiscontinuityType; if (!oldBuffer->meta()->findInt32( "discontinuity", &oldDiscontinuityType)) { - MediaBuffer *mbuf = NULL; - oldBuffer->meta()->findPointer("mediaBuffer", (void**)&mbuf); - if (mbuf != NULL) { - mbuf->release(); - } it = mBuffers.erase(it); continue; } |