diff options
| author | James Dong <jdong@google.com> | 2010-07-20 14:29:39 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-07-20 14:29:39 -0700 |
| commit | 3108231d90e8aa324923fd8864ca2477948c5d25 (patch) | |
| tree | 30ceda3e1126c4d57284fd1f866d78935ebade6f /media/libstagefright/codecs/m4v_h263 | |
| parent | 24ecd378305a3bf6fde74c8773bca09d0fd06c58 (diff) | |
| parent | faed5cd124a54b8db3429f4c26b3220bbec4c8bb (diff) | |
| download | frameworks_av-3108231d90e8aa324923fd8864ca2477948c5d25.zip frameworks_av-3108231d90e8aa324923fd8864ca2477948c5d25.tar.gz frameworks_av-3108231d90e8aa324923fd8864ca2477948c5d25.tar.bz2 | |
Merge "Progress status notification" into gingerbread
Diffstat (limited to 'media/libstagefright/codecs/m4v_h263')
| -rw-r--r-- | media/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp b/media/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp index e375250..5002442 100644 --- a/media/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp +++ b/media/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp @@ -267,7 +267,6 @@ sp<MetaData> M4vH263Encoder::getFormat() { status_t M4vH263Encoder::read( MediaBuffer **out, const ReadOptions *options) { - CHECK(!options); *out = NULL; MediaBuffer *outputBuffer; |