Merge commit 'c4abc9098cacb227dba39bac6aea16b2bceba0d0'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Jul 2013 02:48:39 +0000 (04:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Jul 2013 02:53:52 +0000 (04:53 +0200)
* commit 'c4abc9098cacb227dba39bac6aea16b2bceba0d0':
  vqavideo: check the version

Conflicts:
libavcodec/vqavideo.c

See: b226af39107f09cd650875388250f4968eea54db

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/vqavideo.c

index a47e2db..0a2b668 100644 (file)
@@ -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]);