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

Commit 61c2351d authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Fix mismatched-tags error 

These are exposed when frameworks/av/include is moved from being a
system include directory to a normal include directory.

Test: m -j checkbuild
Change-Id: Iaa8f3808d578ebedc75e863b9818cfbbec9080b2
parent 51ac3550

cmds/stagefright/SimplePlayer.h

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ namespace android { 


struct ABuffer;

struct ALooper;

struct AudioTrack;

class AudioTrack;

class IGraphicBufferProducer;

struct MediaCodec;

class MediaCodecBuffer;

include/media/IMediaPlayerService.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
namespace android {



struct IHDCP;

struct IMediaCodecList;

class IMediaCodecList;

struct IMediaHTTPService;

class IMediaRecorder;

class IOMX;

include/media/MediaCodecInfo.h

+2 −2
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ struct MediaCodecInfo : public RefBase { 


        DISALLOW_EVIL_CONSTRUCTORS(Capabilities);



        friend class MediaCodecInfo;

        friend struct MediaCodecInfo;

    };



    // Use a subclass to allow setting fields on construction without allowing
@@ -136,7 +136,7 @@ private: 


    DISALLOW_EVIL_CONSTRUCTORS(MediaCodecInfo);



    friend class MediaCodecList;

    friend struct MediaCodecList;

    friend class MediaCodecListOverridesTest;

};

include/media/stagefright/ACodec.h

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ namespace android { 
struct ABuffer;

class ACodecBufferChannel;

class MediaCodecBuffer;

struct MemoryDealer;

class MemoryDealer;

struct DescribeColorFormat2Params;

struct DataConverter;

include/media/stagefright/FrameRenderTracker.h

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ private: 
    sp<GraphicBuffer> mGraphicBuffer;

    sp<Fence> mFence;



    friend class FrameRenderTracker;

    friend struct FrameRenderTracker;

};



struct FrameRenderTracker {