fix #290, use iformat only for rtmp input. 1.0.22

README.md

@@ -385,6 +385,7 @@ Supported operating systems and hardware:
 
 ## History
 
+* v1.0, 2015-01-17, hotfix [#290](https://github.com/winlinvip/simple-rtmp-server/issues/290), use iformat only for rtmp input. 1.0.22
 * <strong>v1.0, 2015-01-15, [1.0r1 release(1.0.21)](https://github.com/winlinvip/simple-rtmp-server/releases/tag/1.0r1) released. 59472 lines.</strong>
 * v1.0, 2015-01-08, hotfix [#281](https://github.com/winlinvip/simple-rtmp-server/issues/281), fix hls bug ignore type-9 send aud. 1.0.20
 * v1.0, 2015-01-03, hotfix to remove the pageUrl for http callback. 1.0.19

trunk/src/app/srs_app_ffmpeg.cpp

@@ -209,6 +209,13 @@ int SrsFFMPEG::initialize_transcode(SrsConfDirective* engine)
         return ret;
     }
     
+    // for not rtmp input, donot append the iformat,
+    // for example, "-f flv" before "-i udp://192.168.1.252:2222"
+    // @see https://github.com/winlinvip/simple-rtmp-server/issues/290
+    if (input.find("rtmp://") != 0) {
+        iformat = "";
+    }
+    
     return ret;
 }
 

trunk/src/core/srs_core.hpp

@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // current release version
 #define VERSION_MAJOR       1
 #define VERSION_MINOR       0
-#define VERSION_REVISION    21
+#define VERSION_REVISION    22
 // server info.
 #define RTMP_SIG_SRS_KEY "SRS"
 #define RTMP_SIG_SRS_ROLE "origin/edge server"