summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorChih-hung Hsieh <chh@google.com>2014-11-24 22:00:39 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-11-24 22:00:40 +0000
commitdb1ce33e0159bbbc3946c163c9ba1077182823f1 (patch)
treebd292875ca45c5413646dd792a6e71a1f2ab2b50 /media
parent07715ac3b9309b397fb911ef81a393c4493cf20d (diff)
parent6466e82390ccd7b3dbb4c03a716fd25f0cb9777a (diff)
downloadframeworks_av-db1ce33e0159bbbc3946c163c9ba1077182823f1.zip
frameworks_av-db1ce33e0159bbbc3946c163c9ba1077182823f1.tar.gz
frameworks_av-db1ce33e0159bbbc3946c163c9ba1077182823f1.tar.bz2
Merge "Remove check for an impossible condition"
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/codecs/avc/enc/src/init.cpp4
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];