From cb7190cd2c691fd93e4d3664f3fce6c19ee001dd Mon Sep 17 00:00:00 2001
From: Janne Grunau <janne-libav@jannau.net>
Date: Fri, 23 Mar 2012 22:30:38 +0100
Subject: rv34: error out on size changes with frame threading

---
 libavcodec/rv34.c | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'libavcodec/rv34.c')

diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c
index f9ea40d6c8..da5d437b07 100644
--- a/libavcodec/rv34.c
+++ b/libavcodec/rv34.c
@@ -1662,6 +1662,13 @@ int ff_rv34_decode_frame(AVCodecContext *avctx,
         if (s->width != si.width || s->height != si.height) {
             int err;
 
+            if (HAVE_THREADS &&
+                (s->avctx->active_thread_type & FF_THREAD_FRAME)) {
+                av_log_missing_feature(s->avctx, "Width/height changing with "
+                                       "frame threading is", 0);
+                return AVERROR_PATCHWELCOME;
+            }
+
             av_log(s->avctx, AV_LOG_WARNING, "Changing dimensions to %dx%d\n",
                    si.width, si.height);
             ff_MPV_common_end(s);
-- 
cgit v1.2.3