OSDN Git Service

resolved conflicts for merge of 998a929a to master
authorAndreas Huber <andih@google.com>
Tue, 29 Nov 2011 23:14:44 +0000 (15:14 -0800)
committerAndreas Huber <andih@google.com>
Tue, 29 Nov 2011 23:14:44 +0000 (15:14 -0800)
commiteca36b5a1759970bc3d0373d72d6fec7c9b7e944
treeb7926335dcc15adaec73e4cfd4b53068c32a74f5
parent404a123bed7f180724ead17f10e037b3eb347701
parentb19386fe52b727524de59a7673b2f56b2e707d51
resolved conflicts for merge of 998a929a to master

Change-Id: Id5cfbcf20e5ec28782cc88075040cf9edebfdfe8
media/libmediaplayerservice/nuplayer/NuPlayer.cpp
media/libstagefright/mpeg2ts/ATSParser.cpp
media/libstagefright/mpeg2ts/AnotherPacketSource.cpp
media/libstagefright/mpeg2ts/MPEG2PSExtractor.cpp