diff options
| author | Lajos Molnar <lajos@google.com> | 2014-09-05 23:08:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-05 23:08:54 +0000 |
| commit | 52c6a355503dbbe9bb134af07faee982534031dd (patch) | |
| tree | 1f14c64f0421738f1a6371b62fcd54b78e08640d /media | |
| parent | f17882b310426d243f8cd541f1774c03ccdd4957 (diff) | |
| parent | 5da491bb05009e2062d8a98a153594bb3ff15188 (diff) | |
| download | frameworks_av-52c6a355503dbbe9bb134af07faee982534031dd.zip frameworks_av-52c6a355503dbbe9bb134af07faee982534031dd.tar.gz frameworks_av-52c6a355503dbbe9bb134af07faee982534031dd.tar.bz2 | |
Merge "stagefright: allow P-frames spacing of 0 and 1" into lmp-dev
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/ACodec.cpp | 1 | ||||
| -rw-r--r-- | media/libstagefright/OMXCodec.cpp | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp index 19a5908..9b03b71 100644 --- a/media/libstagefright/ACodec.cpp +++ b/media/libstagefright/ACodec.cpp @@ -2313,7 +2313,6 @@ static OMX_U32 setPFramesSpacing(int32_t iFramesInterval, int32_t frameRate) { return 0; } OMX_U32 ret = frameRate * iFramesInterval; - CHECK(ret > 1); return ret; } diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index 78758da..a8806c8 100644 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -994,7 +994,6 @@ static OMX_U32 setPFramesSpacing(int32_t iFramesInterval, int32_t frameRate) { return 0; } OMX_U32 ret = frameRate * iFramesInterval - 1; - CHECK(ret > 1); return ret; } |