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

Commit c80b9b83 authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by Gerrit Code Review
Browse files

Merge "Fix struct vs. class mismatches"

parents 3bc345f5 86a58cab

cmds/stagefright/SineSource.h

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


namespace android {



struct MediaBufferGroup;

class MediaBufferGroup;



struct SineSource : public MediaSource {

    SineSource(int32_t sampleRate, int32_t numChannels);

include/media/stagefright/foundation/AString.h

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


namespace android {



struct String8;

class String8;

struct Parcel;



struct AString {

media/libmediaplayerservice/nuplayer/NuPlayer.h

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


struct ABuffer;

struct AMessage;

struct MetaData;

class MetaData;

struct NuPlayerDriver;



struct NuPlayer : public AHandler {

media/libmediaplayerservice/nuplayer/NuPlayerSource.h

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
namespace android {



struct ABuffer;

struct MetaData;

struct MediaBuffer;



struct NuPlayer::Source : public AHandler {

media/libstagefright/httplive/PlaylistFetcher.h

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ struct DataSource; 
struct HTTPBase;

struct LiveDataSource;

struct M3UParser;

struct String8;

class String8;



struct PlaylistFetcher : public AHandler {

    enum {