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

Commit e0df7455 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Fix mismatched-tags error" am: 604224ed am: 004ac55a 

am: 9d64132b

Change-Id: I37563d77d2eaf6db5d1c5b579ad1f930f2d8f1e1
parents 5afa6ae2 9d64132b

cmds/stagefright/SimplePlayer.h

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




struct ABuffer;

struct ABuffer;

struct ALooper;

struct ALooper;

struct AudioTrack;

class AudioTrack;

class IGraphicBufferProducer;

class IGraphicBufferProducer;

struct MediaCodec;

struct MediaCodec;

struct NuMediaExtractor;

struct NuMediaExtractor;

include/media/IMediaPlayerService.h

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

namespace android {





struct IHDCP;

struct IHDCP;

struct IMediaCodecList;

class IMediaCodecList;

struct IMediaHTTPService;

struct IMediaHTTPService;

class IMediaRecorder;

class IMediaRecorder;

class IOMX;

class IOMX;

include/media/MediaCodecInfo.h

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




        DISALLOW_EVIL_CONSTRUCTORS(Capabilities);

        DISALLOW_EVIL_CONSTRUCTORS(Capabilities);





        friend class MediaCodecInfo;

        friend struct MediaCodecInfo;

    };

    };





    // Use a subclass to allow setting fields on construction without allowing

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




    DISALLOW_EVIL_CONSTRUCTORS(MediaCodecInfo);

    DISALLOW_EVIL_CONSTRUCTORS(MediaCodecInfo);





    friend class MediaCodecList;

    friend struct MediaCodecList;

    friend class MediaCodecListOverridesTest;

    friend class MediaCodecListOverridesTest;

};

};

include/media/stagefright/ACodec.h

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

namespace android {





struct ABuffer;

struct ABuffer;

struct MemoryDealer;

class MemoryDealer;

struct DescribeColorFormat2Params;

struct DescribeColorFormat2Params;

struct DataConverter;

struct DataConverter;

include/media/stagefright/FrameRenderTracker.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -82,7 +82,7 @@ struct FrameRenderTracker { 
        sp<GraphicBuffer> mGraphicBuffer;

        sp<GraphicBuffer> mGraphicBuffer;

        sp<Fence> mFence;

        sp<Fence> mFence;





        friend class FrameRenderTracker;

        friend struct FrameRenderTracker;

    };

    };





    FrameRenderTracker();

    FrameRenderTracker();