From: Anthony Minessale <anthm@freeswitch.org>
Date: Tue, 10 Mar 2015 22:58:19 +0000 (-0500)
Subject: FS-7514: merge conflict from hell
X-Git-Tag: v1.6.2~614^2~279
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc09ade1a5165ce93171f1935f501f6c06de8c15;p=thirdparty%2Ffreeswitch.git

FS-7514: merge conflict from hell
---

diff --git a/src/mod/formats/mod_vlc/mod_vlc.c b/src/mod/formats/mod_vlc/mod_vlc.c
index a12e17eb9a..3c9800f0ed 100644
--- a/src/mod/formats/mod_vlc/mod_vlc.c
+++ b/src/mod/formats/mod_vlc/mod_vlc.c
@@ -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);
 		} 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;
 			ab = 128;