external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

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

Browse source
This commit is contained in:
winlin 2015-01-17 13:04:52 +08:00
parent 118efcbbf8
commit 4449a8d7b0
3 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
trunk/src/app/srs_app_ffmpeg.cpp
View file

@ -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;
}

2
trunk/src/core/srs_core.hpp
View file

@ -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"