diff options
| author | Andreas Huber <andih@google.com> | 2011-11-29 15:14:44 -0800 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2011-11-29 15:14:44 -0800 |
| commit | eca36b5a1759970bc3d0373d72d6fec7c9b7e944 (patch) | |
| tree | b7926335dcc15adaec73e4cfd4b53068c32a74f5 /media/libstagefright/mpeg2ts/MPEG2PSExtractor.cpp | |
| parent | 404a123bed7f180724ead17f10e037b3eb347701 (diff) | |
| parent | b19386fe52b727524de59a7673b2f56b2e707d51 (diff) | |
| download | frameworks_av-eca36b5a1759970bc3d0373d72d6fec7c9b7e944.zip frameworks_av-eca36b5a1759970bc3d0373d72d6fec7c9b7e944.tar.gz frameworks_av-eca36b5a1759970bc3d0373d72d6fec7c9b7e944.tar.bz2 | |
resolved conflicts for merge of 998a929a to master
Change-Id: Id5cfbcf20e5ec28782cc88075040cf9edebfdfe8
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 d68e45b..df30a9c 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: |