aboutsummaryrefslogtreecommitdiff
path: root/lib/ffmpeg/libavcodec/interplayvideo.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/ffmpeg/libavcodec/interplayvideo.c')
-rw-r--r--lib/ffmpeg/libavcodec/interplayvideo.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/ffmpeg/libavcodec/interplayvideo.c b/lib/ffmpeg/libavcodec/interplayvideo.c
index b98386f77c..18702b21d0 100644
--- a/lib/ffmpeg/libavcodec/interplayvideo.c
+++ b/lib/ffmpeg/libavcodec/interplayvideo.c
@@ -99,6 +99,10 @@ static int copy_from(IpvideoContext *s, AVFrame *src, int delta_x, int delta_y)
motion_offset, s->upper_motion_limit_offset);
return -1;
}
+ if (src->data[0] == NULL) {
+ av_log(s->avctx, AV_LOG_ERROR, "Invalid decode type, corrupted header?\n");
+ return AVERROR(EINVAL);
+ }
s->dsp.put_pixels_tab[!s->is_16bpp][0](s->pixel_ptr, src->data[0] + motion_offset,
s->current_frame.linesize[0], 8);
return 0;
@@ -1093,7 +1097,7 @@ static av_cold int ipvideo_decode_end(AVCodecContext *avctx)
return 0;
}
-AVCodec interplay_video_decoder = {
+AVCodec ff_interplay_video_decoder = {
"interplayvideo",
AVMEDIA_TYPE_VIDEO,
CODEC_ID_INTERPLAY_VIDEO,