From 9efe5bff03ca4a0d218b98e0e697d51dea8d5b55 Mon Sep 17 00:00:00 2001 From: Ilkka Ollakka Date: Sat, 29 May 2010 15:04:17 +0300 Subject: [PATCH] avcodec: blacklist WMV2 also, missed that codec previously See #3613 --- modules/codec/avcodec/encoder.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/codec/avcodec/encoder.c b/modules/codec/avcodec/encoder.c index df7daf3625..14d7011c1b 100644 --- a/modules/codec/avcodec/encoder.c +++ b/modules/codec/avcodec/encoder.c @@ -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 ) -- 2.39.5