]> git.sesse.net Git - vlc/commitdiff
avcodec: blacklist WMV2 also, missed that codec previously
authorIlkka Ollakka <ileoo@videolan.org>
Sat, 29 May 2010 12:04:17 +0000 (15:04 +0300)
committerIlkka Ollakka <ileoo@videolan.org>
Sat, 29 May 2010 12:04:29 +0000 (15:04 +0300)
See #3613

modules/codec/avcodec/encoder.c

index df7daf3625c8cc2eb9d3a568c6fad91d07a49bd8..14d7011c1b08a85bc7f81181d9d39fe62a3413f0 100644 (file)
@@ -500,7 +500,8 @@ int OpenEncoder( vlc_object_t *p_this )
         if ( p_sys->i_qmin > 0 && p_sys->i_qmin == p_sys->i_qmax )
             p_context->flags |= CODEC_FLAG_QSCALE;
         /* These codecs cause libavcodec to exit if thread_count is > 1.
-           See libavcodec/mpegvideo_enc.c:MPV_encode_init
+           See libavcodec/mpegvideo_enc.c:MPV_encode_init and
+           libavcodec/svq3.c , WMV2 calls MPV_encode_init also.
          */
         if ( i_codec_id == CODEC_ID_FLV1 ||
              i_codec_id == CODEC_ID_H261 ||
@@ -512,6 +513,7 @@ int OpenEncoder( vlc_object_t *p_this )
              i_codec_id == CODEC_ID_MSMPEG4V2 ||
              i_codec_id == CODEC_ID_MSMPEG4V3 ||
              i_codec_id == CODEC_ID_WMV1 ||
+             i_codec_id == CODEC_ID_WMV2 ||
              i_codec_id == CODEC_ID_RV10 ||
              i_codec_id == CODEC_ID_RV20 ||
              i_codec_id == CODEC_ID_SVQ3 )