diff options
| author | Andreas Huber <andih@google.com> | 2012-09-26 11:00:10 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-26 11:00:10 -0700 |
| commit | 6283af5f0a99bc7cba43bb9d09bd920b438f47c8 (patch) | |
| tree | 37a63c519bd99e21d4ee7309ad54207ec02e6690 | |
| parent | 842c5d9553f3f8e97d04ed1bd0d37e4851240654 (diff) | |
| parent | 019aabab44e396d9a68c8126c9e0745162a4603a (diff) | |
| download | frameworks_av-6283af5f0a99bc7cba43bb9d09bd920b438f47c8.zip frameworks_av-6283af5f0a99bc7cba43bb9d09bd920b438f47c8.tar.gz frameworks_av-6283af5f0a99bc7cba43bb9d09bd920b438f47c8.tar.bz2 | |
Merge "Logic to include HDCP specific PES extra header data was backwards." into jb-mr1-dev
| -rw-r--r-- | media/libstagefright/wifi-display/source/PlaybackSession.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/wifi-display/source/PlaybackSession.cpp b/media/libstagefright/wifi-display/source/PlaybackSession.cpp index 99b3051..ef39713 100644 --- a/media/libstagefright/wifi-display/source/PlaybackSession.cpp +++ b/media/libstagefright/wifi-display/source/PlaybackSession.cpp @@ -1376,8 +1376,8 @@ status_t WifiDisplaySource::PlaybackSession::packetizeAccessUnit( sp<ABuffer> packets; mPacketizer->packetize( track->packetizerTrackIndex(), accessUnit, &packets, flags, - isHDCPEncrypted ? NULL : HDCP_private_data, - isHDCPEncrypted ? 0 : sizeof(HDCP_private_data)); + !isHDCPEncrypted ? NULL : HDCP_private_data, + !isHDCPEncrypted ? 0 : sizeof(HDCP_private_data)); for (size_t offset = 0; offset < packets->size(); offset += 188) { |