Commit 4ee916b3 authored by jehan's avatar jehan
Browse files

Merge branch 'master' of git.linphone.org:/mediastreamer2

parents 623014a9 4dd9f772
......@@ -69,6 +69,8 @@ MSFilterDesc * ms_filter_descs[]={
&ms_audio_mixer_desc,
&ms_g722_dec_desc,
&ms_g722_enc_desc,
&ms_l16_enc_desc,
&ms_l16_dec_desc,
#ifdef VIDEO_ENABLED
&ms_mpeg4_enc_desc,
&ms_mpeg4_dec_desc,
......@@ -79,8 +81,6 @@ MSFilterDesc * ms_filter_descs[]={
&ms_size_conv_desc,
&ms_vp8_enc_desc,
&ms_vp8_dec_desc,
&ms_l16_enc_desc,
&ms_l16_dec_desc,
#endif
NULL
};
......
......@@ -349,7 +349,7 @@ int audio_stream_start_full(AudioStream *stream, RtpProfile *profile, const char
stream->decoder=ms_filter_create_decoder(pt->mime_type);
if ((stream->encoder==NULL) || (stream->decoder==NULL)){
/* big problem: we have not a registered codec for this payload...*/
ms_error("mediastream.c: No decoder available for payload %i.",payload);
ms_error("audio_stream_start_full: No decoder or encoder available for payload %s.",pt->mime_type);
return -1;
}
if (ms_filter_has_method(stream->decoder, MS_FILTER_SET_RTP_PAYLOAD_PICKER)) {
......
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