diff options
| author | Narayan Kamath <narayan@google.com> | 2014-07-09 15:07:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-09 15:07:10 +0000 |
| commit | c24dd75a6baf9448f8a54a671519557fc19d84bd (patch) | |
| tree | 2c6d7260b28ca8ddb6cddcb382c4c848f8fbee62 /media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp | |
| parent | 82d04827c290c0d7b81840897b6466170a500fa3 (diff) | |
| parent | 782be1ecf1022d4e2da714b5aebe51ab616e9975 (diff) | |
| download | frameworks_av-c24dd75a6baf9448f8a54a671519557fc19d84bd.zip frameworks_av-c24dd75a6baf9448f8a54a671519557fc19d84bd.tar.gz frameworks_av-c24dd75a6baf9448f8a54a671519557fc19d84bd.tar.bz2 | |
am 782be1ec: am 1c1b5e51: am c37eaa32: Merge "m4v_h263_enc: Use uint32_t for ULong"
* commit '782be1ecf1022d4e2da714b5aebe51ab616e9975':
m4v_h263_enc: Use uint32_t for ULong
Diffstat (limited to 'media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp')
| -rw-r--r-- | media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp b/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp index e25709d..42c9956 100644 --- a/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp +++ b/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp @@ -721,7 +721,7 @@ void SoftMPEG4Encoder::onQueueFilled(OMX_U32 /* portIndex */) { vin.uChan = vin.yChan + vin.height * vin.pitch; vin.vChan = vin.uChan + ((vin.height * vin.pitch) >> 2); - unsigned long modTimeMs = 0; + ULong modTimeMs = 0; int32_t nLayer = 0; MP4HintTrack hintTrack; if (!PVEncodeVideoFrame(mHandle, &vin, &vout, |