Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76e37adc authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge "Fix struct vs. class mismatch in forward definitions"

parents fb14b87d 0c02eed9

include/media/stagefright/MediaCodec.h

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ struct AMessage; 
struct AReplyToken;

struct AString;

struct CodecBase;

struct IBatteryStats;

class IBatteryStats;

struct ICrypto;

class IMemory;

struct MemoryDealer;
@@ -41,7 +41,7 @@ class IResourceManagerClient; 
class IResourceManagerService;

struct PersistentSurface;

struct SoftwareRenderer;

struct Surface;

class Surface;



struct MediaCodec : public AHandler {

    enum ConfigureFlags {

media/libmediaplayerservice/nuplayer/NuPlayerStreamListener.h

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 


namespace android {



struct MemoryDealer;

class MemoryDealer;



struct NuPlayer::NuPlayerStreamListener : public BnStreamListener {

    NuPlayerStreamListener(