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 a12e17eb9a66b59f3292c96658e22879eb15288f..3c9800f0edc600357ecea121ba7a95aaef6864b9 100644 (file)
--- 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;