diff options
| author | Andreas Huber <andih@google.com> | 2011-11-29 14:10:09 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-29 14:10:09 -0800 |
| commit | b19386fe52b727524de59a7673b2f56b2e707d51 (patch) | |
| tree | 001b5d677ee599a4d6f8d1ba636fbf4e5f0c6a4e /media/libstagefright/mpeg2ts/MPEG2PSExtractor.cpp | |
| parent | 3aadf3a399dc9d14ed85c09c30d4726e2c90536a (diff) | |
| parent | 6e3d311b6631b12aac2879d1b08c3534aece78b1 (diff) | |
| download | frameworks_av-b19386fe52b727524de59a7673b2f56b2e707d51.zip frameworks_av-b19386fe52b727524de59a7673b2f56b2e707d51.tar.gz frameworks_av-b19386fe52b727524de59a7673b2f56b2e707d51.tar.bz2 | |
am 405a4e34: Merge "Finer granularity discontinuity support." into ics-mr1
* commit '405a4e34032f8a07028138266fe9f79f6753b466':
Finer granularity discontinuity support.
Diffstat (limited to 'media/libstagefright/mpeg2ts/MPEG2PSExtractor.cpp')
| -rw-r--r-- | media/libstagefright/mpeg2ts/MPEG2PSExtractor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/mpeg2ts/MPEG2PSExtractor.cpp b/media/libstagefright/mpeg2ts/MPEG2PSExtractor.cpp index f55be6e..a089dbf 100644 --- a/media/libstagefright/mpeg2ts/MPEG2PSExtractor.cpp +++ b/media/libstagefright/mpeg2ts/MPEG2PSExtractor.cpp @@ -543,7 +543,7 @@ MPEG2PSExtractor::Track::Track( case ATSParser::STREAMTYPE_H264: mode = ElementaryStreamQueue::H264; break; - case ATSParser::STREAMTYPE_MPEG2_AUDIO_ATDS: + case ATSParser::STREAMTYPE_MPEG2_AUDIO_ADTS: mode = ElementaryStreamQueue::AAC; break; case ATSParser::STREAMTYPE_MPEG1_AUDIO: |