kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FS-7514: merge conflict from hell

This commit is contained in:
Anthony Minessale 2015-03-10 17:58:19 -05:00 committed by Michael Jerris
parent dc2e4c42ca
commit bc09ade1a5
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mod/formats/mod_vlc/mod_vlc.c
View File

@ -789,17 +789,6 @@ static switch_status_t vlc_file_open(switch_file_handle_t *handle, const char *p
path = switch_core_sprintf(context->pool, "#transcode{vcodec=h264,acodec=mp3}:std{access=file,mux=mp4,dst=%s}", path); path = switch_core_sprintf(context->pool, "#transcode{vcodec=h264,acodec=mp3}:std{access=file,mux=mp4,dst=%s}", path);
} else if (handle->stream_name && !strcasecmp(handle->stream_name, "rtmp")) { } else if (handle->stream_name && !strcasecmp(handle->stream_name, "rtmp")) {
path = switch_core_sprintf(context->pool,
"#transcode{venc=x264{keyint=25},"
"vcodec=h264,"
"scale=1,"
"acodec=mp3,"
"ab=16,"
"channels=2,"
"samplerate=44100}:standard{access=avio,"
"mux=flv,"
"dst=rtmp://%s}", path);
samplerate = 44100; samplerate = 44100;
ab = 128; ab = 128;