RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-27 01:01:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit 'c4abc9098cacb227dba39bac6aea16b2bceba0d0'

Browse Source 
* commit 'c4abc9098cacb227dba39bac6aea16b2bceba0d0':
  vqavideo: check the version

Conflicts:
	libavcodec/vqavideo.c

See: b226af3910

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-07-08 04:48:39 +02:00
commit b5a87dc193
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/vqavideo.c
View File

@ -134,8 +134,15 @@ static av_cold int vqa_decode_init(AVCodecContext *avctx)
/* load up the VQA parameters from the header */ /* load up the VQA parameters from the header */
s->vqa_version = s->avctx->extradata[0]; s->vqa_version = s->avctx->extradata[0];
if (s->vqa_version < 1 || s->vqa_version > 3) { switch (s->vqa_version) {
av_log(s->avctx, AV_LOG_ERROR, "unsupported version %d\n", s->vqa_version); case 1:
case 2:
break;
case 3:
avpriv_report_missing_feature(avctx, "VQA Version %d", s->vqa_version);
return AVERROR_PATCHWELCOME;
default:
avpriv_request_sample(avctx, "VQA Version %i", s->vqa_version);
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }
s->width = AV_RL16(&s->avctx->extradata[6]); s->width = AV_RL16(&s->avctx->extradata[6]);