mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2026-06-16 04:32:47 +02:00
avcodec/motion_est: don't add offsets to NULL pointers
Fixes: libavcodec/motion_est.c:94:31: runtime error: applying zero offset to null pointer
Signed-off-by: James Almer <jamrial@gmail.com>
(cherry picked from commit 585a8d5357)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
committed by
Michael Niedermayer
parent
e0b200a1b0
commit
c3c47781fb
@@ -90,12 +90,12 @@ static inline void init_ref(MotionEstContext *c, uint8_t *const src[3],
|
||||
};
|
||||
int i;
|
||||
for(i=0; i<3; i++){
|
||||
c->src[0][i]= src [i] + offset[i];
|
||||
c->ref[0][i]= ref [i] + offset[i];
|
||||
c->src[0][i]= src[i] ? FF_PTR_ADD(src[i], offset[i]) : NULL;
|
||||
c->ref[0][i]= ref[i] ? FF_PTR_ADD(ref[i], offset[i]) : NULL;
|
||||
}
|
||||
if(ref_index){
|
||||
for(i=0; i<3; i++){
|
||||
c->ref[ref_index][i]= ref2[i] + offset[i];
|
||||
c->ref[ref_index][i]= ref2[i] ? FF_PTR_ADD(ref2[i], offset[i]) : NULL;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user