RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-27 09:52:17 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  cavs: Check for negative cbp

Conflicts:
	libavcodec/cavsdec.c

See: 9f06c1c61e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-10-14 10:17:47 +02:00
commit 8d9f08ef32
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/cavsdec.c
View File

@ -609,7 +609,7 @@ static inline int decode_residual_inter(AVSContext *h)
/* get coded block pattern */ /* get coded block pattern */
int cbp = get_ue_golomb(&h->gb); int cbp = get_ue_golomb(&h->gb);
if (cbp > 63U) { if (cbp > 63U) {
av_log(h->avctx, AV_LOG_ERROR, "illegal inter cbp\n"); av_log(h->avctx, AV_LOG_ERROR, "illegal inter cbp %d\n", cbp);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
h->cbp = cbp_tab[cbp][1]; h->cbp = cbp_tab[cbp][1];