diff options
| author | Dan Albert <danalbert@google.com> | 2014-10-04 15:43:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-04 15:43:05 +0000 |
| commit | 57c27c55006f0137a8ad5a87ec62eb89084dcdc6 (patch) | |
| tree | c3b96d240e01100a4d6374291cc8004ab5d2d560 | |
| parent | c51e512ae6341326a584d65e93b3bd1a8190ad05 (diff) | |
| parent | dc28fa7eb4a51ea77c095b0cb9fd757755525492 (diff) | |
| download | frameworks_av-57c27c55006f0137a8ad5a87ec62eb89084dcdc6.zip frameworks_av-57c27c55006f0137a8ad5a87ec62eb89084dcdc6.tar.gz frameworks_av-57c27c55006f0137a8ad5a87ec62eb89084dcdc6.tar.bz2 | |
am dc28fa7e: Merge "Add missing #includes"
* commit 'dc28fa7eb4a51ea77c095b0cb9fd757755525492':
Add missing #includes
| -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 ff6a66e..fa2892b 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 db5f947..0e3b0c5 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 { // ---------------------------------------------------------------------------- @@ -228,7 +230,7 @@ private: Condition mMediaBuffersAvailableCondition; // Avoid copying and equating and default constructor - DISALLOW_IMPLICIT_CONSTRUCTORS(SurfaceMediaSource); + DISALLOW_EVIL_CONSTRUCTORS(SurfaceMediaSource); }; // ---------------------------------------------------------------------------- |