RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '090cd0631140ac1a3a795d2adfac5dbf5e381aa2' 

* commit '090cd0631140ac1a3a795d2adfac5dbf5e381aa2':
  vc1: check the source buffer in vc1_mc functions

Conflicts:
	libavcodec/vc1dec.c

See: 3a04c18d89
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-08-06 15:56:01 +02:00
parent 06fd4e45d9 090cd06311
commit f606c6e92c
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/vc1dec.c
View File

@ -408,8 +408,10 @@ static void vc1_mc_1mv(VC1Context *v, int dir)
use_ic = v->next_use_ic;
}
if(!srcY)
if (!srcY || !srcU) {
av_log(v->s.avctx, AV_LOG_ERROR, "Referenced frame missing.\n");
return;
}
src_x = s->mb_x * 16 + (mx >> 2);
src_y = s->mb_y * 16 + (my >> 2);
@ -587,8 +589,10 @@ static void vc1_mc_4mv_luma(VC1Context *v, int n, int dir, int avg)
use_ic = v->next_use_ic;
}
if(!srcY)
if (!srcY) {
av_log(v->s.avctx, AV_LOG_ERROR, "Referenced frame missing.\n");
return;
}
if (v->field_mode) {
if (v->cur_field_type != v->ref_field_type[dir])
@ -888,8 +892,10 @@ static void vc1_mc_4mv_chroma(VC1Context *v, int dir)
use_ic = v->next_use_ic;
}
if(!srcU)
if (!srcU) {
av_log(v->s.avctx, AV_LOG_ERROR, "Referenced frame missing.\n");
return;
}
srcU += uvsrc_y * s->uvlinesize + uvsrc_x;
srcV += uvsrc_y * s->uvlinesize + uvsrc_x;