diff options
| author | Lajos Molnar <lajos@google.com> | 2014-09-05 23:26:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-05 23:26:05 +0000 |
| commit | 26fc3c1038fad86179387f9ec81f151eb0a4dcb9 (patch) | |
| tree | 3052c96f6164df27de44172a8f640704cdc16d8c /media/libstagefright | |
| parent | 5b7e6f7afb7370d74212e3ccfe5f4b95c513b72e (diff) | |
| parent | 52c6a355503dbbe9bb134af07faee982534031dd (diff) | |
| download | frameworks_av-26fc3c1038fad86179387f9ec81f151eb0a4dcb9.zip frameworks_av-26fc3c1038fad86179387f9ec81f151eb0a4dcb9.tar.gz frameworks_av-26fc3c1038fad86179387f9ec81f151eb0a4dcb9.tar.bz2 | |
am 52c6a355: Merge "stagefright: allow P-frames spacing of 0 and 1" into lmp-dev
* commit '52c6a355503dbbe9bb134af07faee982534031dd':
stagefright: allow P-frames spacing of 0 and 1
Diffstat (limited to 'media/libstagefright')
| -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 c041d93..0060b88 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; } |