last update

This commit is contained in:
Unknown 2018-02-19 16:13:01 +10:30
parent ff401ee48d
commit 7b50a4e95c
2 changed files with 1 additions and 7 deletions

View File

@ -145,12 +145,6 @@ func TestFlvOutputFile(t *testing.T) {
} }
*/ */
<<<<<<< Updated upstream
=======
>>>>>>> Stashed changes
// Test h264 inputfile to flv format into rtmp using librtmp c wrapper // Test h264 inputfile to flv format into rtmp using librtmp c wrapper
func TestRtmpOutputUsingLibRtmp(t *testing.T){ func TestRtmpOutputUsingLibRtmp(t *testing.T){
config := Config{ config := Config{