summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/mpeg2ts
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2012-04-18 12:22:58 -0700
committerAndreas Huber <andih@google.com>2012-04-18 12:22:58 -0700
commitf69e53033f23f9f70fcdb28a3c2e650de0147459 (patch)
tree3654454a30b35e3060d6aef8bec5e56bb8696af6 /media/libstagefright/mpeg2ts
parent97b5d0d5b5ef766eb5dd680d05a5d199662d4ae0 (diff)
downloadframeworks_av-f69e53033f23f9f70fcdb28a3c2e650de0147459.zip
frameworks_av-f69e53033f23f9f70fcdb28a3c2e650de0147459.tar.gz
frameworks_av-f69e53033f23f9f70fcdb28a3c2e650de0147459.tar.bz2
Some refactoring and cleanup of now obsolete crypto fields.
codec commandline tool no longer supports decryption. Change-Id: I7b10be6524631b20ac5d361d47949b00addf4a93
Diffstat (limited to 'media/libstagefright/mpeg2ts')
-rw-r--r--media/libstagefright/mpeg2ts/AnotherPacketSource.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/media/libstagefright/mpeg2ts/AnotherPacketSource.cpp b/media/libstagefright/mpeg2ts/AnotherPacketSource.cpp
index e1ac53c..d708ba6 100644
--- a/media/libstagefright/mpeg2ts/AnotherPacketSource.cpp
+++ b/media/libstagefright/mpeg2ts/AnotherPacketSource.cpp
@@ -117,12 +117,6 @@ status_t AnotherPacketSource::read(
mediaBuffer->meta_data()->setInt64(kKeyTime, timeUs);
- int32_t scrambling;
- if (buffer->meta()->findInt32("scrambling", &scrambling)
- && scrambling != 0) {
- mediaBuffer->meta_data()->setInt32(kKeyScrambling, scrambling);
- }
-
*out = mediaBuffer;
return OK;
}