diff options
| author | Chih-hung Hsieh <chh@google.com> | 2014-11-25 19:03:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-25 19:03:29 +0000 |
| commit | 9459b3e1eafa6fbb2eb01702133f41f23bb8264a (patch) | |
| tree | 3e5798521a63885237031ae4575b1a9c268cc367 /media/libstagefright | |
| parent | df0b3e0c0406f277796322d0a61c6abcb12650ea (diff) | |
| parent | 112ba59269c4d7192cb4f590b05c6058f5daafb9 (diff) | |
| download | frameworks_av-9459b3e1eafa6fbb2eb01702133f41f23bb8264a.zip frameworks_av-9459b3e1eafa6fbb2eb01702133f41f23bb8264a.tar.gz frameworks_av-9459b3e1eafa6fbb2eb01702133f41f23bb8264a.tar.bz2 | |
am 112ba592: am 6c7d332f: Merge "Remove bogus forward declarations"
* commit '112ba59269c4d7192cb4f590b05c6058f5daafb9':
Remove bogus forward declarations
Diffstat (limited to 'media/libstagefright')
| -rw-r--r-- | media/libstagefright/codecs/avc/enc/SoftAVCEncoder.h | 2 | ||||
| -rw-r--r-- | media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.h | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/media/libstagefright/codecs/avc/enc/SoftAVCEncoder.h b/media/libstagefright/codecs/avc/enc/SoftAVCEncoder.h index 130593f..3e6cd0a 100644 --- a/media/libstagefright/codecs/avc/enc/SoftAVCEncoder.h +++ b/media/libstagefright/codecs/avc/enc/SoftAVCEncoder.h @@ -26,8 +26,6 @@ namespace android { -struct MediaBuffer; - struct SoftAVCEncoder : public MediaBufferObserver, public SoftVideoEncoderOMXComponent { SoftAVCEncoder( diff --git a/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.h b/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.h index b0605b4..d706bb4 100644 --- a/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.h +++ b/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.h @@ -25,8 +25,6 @@ namespace android { -struct MediaBuffer; - struct SoftMPEG4Encoder : public SoftVideoEncoderOMXComponent { SoftMPEG4Encoder( const char *name, |