diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-08 04:48:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-08 04:53:52 +0200 |
| commit | b5a87dc193d6901a00aa4d195f1aae9519b8712f (patch) | |
| tree | fa194ed2ea8784b3f59b7d90ad74a5cf44b8943b /libavcodec | |
| parent | f982d006bb9e5ffb6bc032e62b5f34177a83df85 (diff) | |
| parent | c4abc9098cacb227dba39bac6aea16b2bceba0d0 (diff) | |
| download | ffmpeg-b5a87dc193d6901a00aa4d195f1aae9519b8712f.tar.gz | |
Merge commit 'c4abc9098cacb227dba39bac6aea16b2bceba0d0'
* commit 'c4abc9098cacb227dba39bac6aea16b2bceba0d0':
vqavideo: check the version
Conflicts:
libavcodec/vqavideo.c
See: b226af39107f09cd650875388250f4968eea54db
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/vqavideo.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/libavcodec/vqavideo.c b/libavcodec/vqavideo.c index a47e2db041..0a2b668d29 100644 --- a/libavcodec/vqavideo.c +++ b/libavcodec/vqavideo.c @@ -134,8 +134,15 @@ static av_cold int vqa_decode_init(AVCodecContext *avctx) /* load up the VQA parameters from the header */ s->vqa_version = s->avctx->extradata[0]; - if (s->vqa_version < 1 || s->vqa_version > 3) { - av_log(s->avctx, AV_LOG_ERROR, "unsupported version %d\n", s->vqa_version); + switch (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; } s->width = AV_RL16(&s->avctx->extradata[6]); |