diff options
| author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-10-06 13:22:16 -0700 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-10-06 13:22:16 -0700 |
| commit | cb1cdffd7dfae7db36ecd06ce058eba505fb1b9d (patch) | |
| tree | 77b3c4f0794948b7bbea40a65d0f7856cde7f770 /media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp | |
| parent | 3f6bb688b22b184b0bfc2739cda3c3cf0dd06a14 (diff) | |
| parent | f42ee8bd0cb51c571dd6dfcf71c61dce377768cd (diff) | |
| download | frameworks_av-cb1cdffd7dfae7db36ecd06ce058eba505fb1b9d.zip frameworks_av-cb1cdffd7dfae7db36ecd06ce058eba505fb1b9d.tar.gz frameworks_av-cb1cdffd7dfae7db36ecd06ce058eba505fb1b9d.tar.bz2 | |
Merge tag 'android-6.0.1_r72' into HEAD
Android 6.0.1 Release 72 (M4B30X)
Change-Id: I617426a3fbf7a8d013c5be838ad4c80a00b61a5f
Diffstat (limited to 'media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp')
| -rw-r--r-- | media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp b/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp index 7638bb7..2eb51c9 100644 --- a/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp +++ b/media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp @@ -116,6 +116,10 @@ OMX_ERRORTYPE SoftMPEG4Encoder::initEncParams() { ALOGE("Failed to get default encoding parameters"); return OMX_ErrorUndefined; } + if (mFramerate == 0) { + ALOGE("Framerate should not be 0"); + return OMX_ErrorUndefined; + } mEncParams->encMode = mEncodeMode; mEncParams->encWidth[0] = mWidth; mEncParams->encHeight[0] = mHeight; |