[FFmpeg-cvslog] vp3dec: move threads check out of header packet type check

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 28 22:43:30 2013 +0100| [14c8ee00ffd9d45e6e0c6f11a957ce7e56f7eb3a] | committer: Michael Niedermayer

vp3dec: move threads check out of header packet type check

Prevents reconfiguration with threads which is unsupported
and would bring the contexts into an inconsistent state.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=14c8ee00ffd9d45e6e0c6f11a957ce7e56f7eb3a
---

 libavcodec/vp3.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index 792dbb2..00a77e9 100644
--- a/libavcodec/vp3.c
+++ b/libavcodec/vp3.c
@@ -1928,11 +1928,11 @@ static int vp3_decode_frame(AVCodecContext *avctx,
         int type = get_bits(&gb, 7);
         skip_bits_long(&gb, 6*8); /* "theora" */
 
+        if (s->avctx->active_thread_type&FF_THREAD_FRAME) {
+            av_log(avctx, AV_LOG_ERROR, "midstream reconfiguration with multithreading is unsupported, try -threads 1\n");
+            return AVERROR_PATCHWELCOME;
+        }
         if (type == 0) {
-            if (s->avctx->active_thread_type&FF_THREAD_FRAME) {
-                av_log(avctx, AV_LOG_ERROR, "midstream reconfiguration with multithreading is unsupported, try -threads 1\n");
-                return AVERROR_PATCHWELCOME;
-            }
             vp3_decode_end(avctx);
             ret = theora_decode_header(avctx, &gb);