diff options
| author | Dan Albert <danalbert@google.com> | 2014-10-04 15:47:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-04 15:47:22 +0000 |
| commit | 8d8a489c9a4b813b8e8f1510b3d369516f4b52f2 (patch) | |
| tree | 148a091a7e0e16257a9ba30841368faf2c179386 /include | |
| parent | 176dda365968a32eec62c440c14ac0d4133241f5 (diff) | |
| parent | 57c27c55006f0137a8ad5a87ec62eb89084dcdc6 (diff) | |
| download | frameworks_av-8d8a489c9a4b813b8e8f1510b3d369516f4b52f2.zip frameworks_av-8d8a489c9a4b813b8e8f1510b3d369516f4b52f2.tar.gz frameworks_av-8d8a489c9a4b813b8e8f1510b3d369516f4b52f2.tar.bz2 | |
am 57c27c55: am dc28fa7e: Merge "Add missing #includes"
* commit '57c27c55006f0137a8ad5a87ec62eb89084dcdc6':
Add missing #includes
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/AACWriter.h | 1 | ||||
| -rw-r--r-- | include/media/stagefright/ClockEstimator.h | 2 | ||||
| -rw-r--r-- | include/media/stagefright/MediaMuxer.h | 2 | ||||
| -rw-r--r-- | include/media/stagefright/SurfaceMediaSource.h | 4 |
4 files changed, 7 insertions, 2 deletions
diff --git a/include/media/stagefright/AACWriter.h b/include/media/stagefright/AACWriter.h index df1b053..d22707a 100644 --- a/include/media/stagefright/AACWriter.h +++ b/include/media/stagefright/AACWriter.h @@ -17,6 +17,7 @@ #ifndef AAC_WRITER_H_ #define AAC_WRITER_H_ +#include "foundation/ABase.h" #include <media/stagefright/MediaWriter.h> #include <utils/threads.h> diff --git a/include/media/stagefright/ClockEstimator.h b/include/media/stagefright/ClockEstimator.h index 2fd6e75..1455b7f 100644 --- a/include/media/stagefright/ClockEstimator.h +++ b/include/media/stagefright/ClockEstimator.h @@ -19,7 +19,7 @@ #define CLOCK_ESTIMATOR_H_ - +#include "foundation/ABase.h" #include <utils/RefBase.h> #include <utils/Vector.h> diff --git a/include/media/stagefright/MediaMuxer.h b/include/media/stagefright/MediaMuxer.h index bbe4303..9da98d9 100644 --- a/include/media/stagefright/MediaMuxer.h +++ b/include/media/stagefright/MediaMuxer.h @@ -22,6 +22,8 @@ #include <utils/Vector.h> #include <utils/threads.h> +#include "foundation/ABase.h" + namespace android { struct ABuffer; diff --git a/include/media/stagefright/SurfaceMediaSource.h b/include/media/stagefright/SurfaceMediaSource.h index 43b75fd..ffe4f4c 100644 --- a/include/media/stagefright/SurfaceMediaSource.h +++ b/include/media/stagefright/SurfaceMediaSource.h @@ -25,6 +25,8 @@ #include <media/stagefright/MediaSource.h> #include <media/stagefright/MediaBuffer.h> +#include "foundation/ABase.h" + namespace android { // ---------------------------------------------------------------------------- @@ -233,7 +235,7 @@ private: Condition mMediaBuffersAvailableCondition; // Avoid copying and equating and default constructor - DISALLOW_IMPLICIT_CONSTRUCTORS(SurfaceMediaSource); + DISALLOW_EVIL_CONSTRUCTORS(SurfaceMediaSource); }; // ---------------------------------------------------------------------------- |