Attachment #866849 for bug #911567

View | Details | Raw Unified | Return to bug 911567
Collapse All | Expand All

Lines 36-41 Link Here

(-)a/intern/ffmpeg/ffmpeg_compat.h (+4 lines)
36	# define FFMPEG_INLINE static inline	36	# define FFMPEG_INLINE static inline
37	#endif	37	#endif
38		38
		39	#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58,132,100)
		40	# define AV_CODEC_CAP_OTHER_THREADS AV_CODEC_CAP_AUTO_THREADS
		41	#endif
		42
39	#if (LIBAVFORMAT_VERSION_MAJOR < 58) \|\| \	43	#if (LIBAVFORMAT_VERSION_MAJOR < 58) \|\| \
40	((LIBAVFORMAT_VERSION_MAJOR == 58) && (LIBAVFORMAT_VERSION_MINOR < 76))	44	((LIBAVFORMAT_VERSION_MAJOR == 58) && (LIBAVFORMAT_VERSION_MINOR < 76))
41	# define FFMPEG_USE_DURATION_WORKAROUND 1	45	# define FFMPEG_USE_DURATION_WORKAROUND 1

Lines 855-861 static AVStream alloc_video_stream(FFMpegContext context, Link Here

(-)a/source/blender/blenkernel/intern/writeffmpeg.c (-1 / +1 lines)
855	255);	855	255);
856	st->avg_frame_rate = av_inv_q(c->time_base);	856	st->avg_frame_rate = av_inv_q(c->time_base);
857		857
858	if (codec->capabilities & AV_CODEC_CAP_AUTO_THREADS) {	858	if (codec->capabilities & AV_CODEC_CAP_OTHER_THREADS) {
859	c->thread_count = 0;	859	c->thread_count = 0;
860	}	860	}
861	else {	861	else {

Lines 554-560 static int startffmpeg(struct anim *anim) Link Here

(-)a/source/blender/imbuf/intern/anim_movie.c (-1 / +1 lines)
554	avcodec_parameters_to_context(pCodecCtx, video_stream->codecpar);	554	avcodec_parameters_to_context(pCodecCtx, video_stream->codecpar);
555	pCodecCtx->workaround_bugs = FF_BUG_AUTODETECT;	555	pCodecCtx->workaround_bugs = FF_BUG_AUTODETECT;
556		556
557	if (pCodec->capabilities & AV_CODEC_CAP_AUTO_THREADS) {	557	if (pCodec->capabilities & AV_CODEC_CAP_OTHER_THREADS) {
558	pCodecCtx->thread_count = 0;	558	pCodecCtx->thread_count = 0;
559	}	559	}
560	else {	560	else {

Lines 559-565 static struct proxy_output_ctx *alloc_proxy_output_ffmpeg( Link Here

(-)a/source/blender/imbuf/intern/indexer.c (-2 / +2 lines)
559	av_dict_set(&codec_opts, "preset", "veryfast", 0);	559	av_dict_set(&codec_opts, "preset", "veryfast", 0);
560	av_dict_set(&codec_opts, "tune", "fastdecode", 0);	560	av_dict_set(&codec_opts, "tune", "fastdecode", 0);
561		561
562	if (rv->codec->capabilities & AV_CODEC_CAP_AUTO_THREADS) {	562	if (rv->codec->capabilities & AV_CODEC_CAP_OTHER_THREADS) {
563	rv->c->thread_count = 0;	563	rv->c->thread_count = 0;
564	}	564	}
565	else {	565	else {
Lines 872-878 static IndexBuildContext index_ffmpeg_create_context(struct anim anim, Link Here
872	avcodec_parameters_to_context(context->iCodecCtx, context->iStream->codecpar);	872	avcodec_parameters_to_context(context->iCodecCtx, context->iStream->codecpar);
873	context->iCodecCtx->workaround_bugs = FF_BUG_AUTODETECT;	873	context->iCodecCtx->workaround_bugs = FF_BUG_AUTODETECT;
874		874
875	if (context->iCodec->capabilities & AV_CODEC_CAP_AUTO_THREADS) {	875	if (context->iCodec->capabilities & AV_CODEC_CAP_OTHER_THREADS) {
876	context->iCodecCtx->thread_count = 0;	876	context->iCodecCtx->thread_count = 0;
877	}	877	}
878	else {	878	else {

Return to bug 911567