[SCM] libav/experimental: 10l

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 000a9c02db82684bc91751f7f41864df98b5f88a
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Thu Apr 29 22:12:29 2004 +0000

    10l
    
    Originally committed as revision 3088 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 29804b7..7b97e15 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -597,6 +597,11 @@ int MPV_common_init(MpegEncContext *s)
 {
     int y_size, c_size, yc_size, i, mb_array_size, mv_table_size, x, y;
 
+    if(s->avctx->thread_count > MAX_THREADS || 16*s->avctx->thread_count > s->height){
+        av_log(s->avctx, AV_LOG_ERROR, "too many threads\n");
+        return -1;
+    }
+
     dsputil_init(&s->dsp, s->avctx);
     DCT_common_init(s);
 
@@ -990,11 +995,6 @@ int MPV_encode_init(AVCodecContext *avctx)
         return -1;
     }
     
-    if(s->avctx->thread_count > MAX_THREADS || 16*s->avctx->thread_count > s->height){
-        av_log(avctx, AV_LOG_ERROR, "too many threads\n");
-        return -1;
-    }
-    
     if(s->avctx->thread_count > 1)
         s->rtp_mode= 1;
 

-- 
Libav/FFmpeg packaging