Commit 863a2d61 authored by Simon Morlat's avatar Simon Morlat

restore ffmpeg support, which was dropped accidentally.

parent b970cdf9
......@@ -261,12 +261,18 @@ void ms_factory_init_voip(MSFactory *obj){
if (obj->voip_initd) return;
ms_srtp_init();
/* register builtin VoIP MSFilter's */
for (i=0;ms_voip_filter_descs[i]!=NULL;i++){
ms_factory_register_filter(obj,ms_voip_filter_descs[i]);
}
#if defined(VIDEO_ENABLED) && defined(MS2_FILTERS) && !defined(NO_FFMPEG) && defined(HAVE_LIBAVCODEC_AVCODEC_H)
ms_ffmpeg_check_init();
__register_ffmpeg_encoders_if_possible(obj);
__register_ffmpeg_h264_decoder_if_possible(obj);
#endif
#if defined(__APPLE__) && defined(VIDEO_ENABLED)
_register_videotoolbox_if_supported(obj);
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment