diff options
| author | Chih-hung Hsieh <chh@google.com> | 2014-11-25 19:03:13 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-25 19:03:13 +0000 |
| commit | 70d4f7f44da0f95514d0cfb404874e780ea62be5 (patch) | |
| tree | 3aa04fb810617f80676c204dca4326cb67bf32de /media/libstagefright | |
| parent | 6b6d8a79ef821541a7687ed924959369f73fc977 (diff) | |
| parent | 128b785027033c8c74a858a3dac27cfcb2a9ae7f (diff) | |
| download | frameworks_av-70d4f7f44da0f95514d0cfb404874e780ea62be5.zip frameworks_av-70d4f7f44da0f95514d0cfb404874e780ea62be5.tar.gz frameworks_av-70d4f7f44da0f95514d0cfb404874e780ea62be5.tar.bz2 | |
am 128b7850: am db1ce33e: Merge "Remove check for an impossible condition"
* commit '128b785027033c8c74a858a3dac27cfcb2a9ae7f':
Remove check for an impossible condition
Diffstat (limited to 'media/libstagefright')
| -rw-r--r-- | media/libstagefright/codecs/avc/enc/src/init.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/media/libstagefright/codecs/avc/enc/src/init.cpp b/media/libstagefright/codecs/avc/enc/src/init.cpp index c258b57..6e1413a 100644 --- a/media/libstagefright/codecs/avc/enc/src/init.cpp +++ b/media/libstagefright/codecs/avc/enc/src/init.cpp @@ -177,10 +177,6 @@ AVCEnc_Status SetEncodeParam(AVCHandle* avcHandle, AVCEncParams* encParam, seqParam->offset_for_non_ref_pic = extS->offset_for_non_ref_pic; seqParam->offset_for_top_to_bottom_field = extS->offset_for_top_to_bottom_field; seqParam->num_ref_frames_in_pic_order_cnt_cycle = extS->num_ref_frames_in_pic_order_cnt_cycle; - if (extS->offset_for_ref_frame == NULL) - { - return AVCENC_ENCPARAM_MEM_FAIL; - } for (ii = 0; ii < (int) extS->num_ref_frames; ii++) { seqParam->offset_for_ref_frame[ii] = extS->offset_for_ref_frame[ii]; |